From cc0a403181c200e2bcdfe2488556ec657ecae512 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 21 Sep 2022 01:24:55 -0300 Subject: [PATCH] Forgot to disable the find-replace component in UITextEdit. --- include/eepp/ui/uicodeeditor.hpp | 5 +++++ src/eepp/ui/uicodeeditor.cpp | 11 +++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/eepp/ui/uicodeeditor.hpp b/include/eepp/ui/uicodeeditor.hpp index 20a95999c..2fb86bbd9 100644 --- a/include/eepp/ui/uicodeeditor.hpp +++ b/include/eepp/ui/uicodeeditor.hpp @@ -480,6 +480,10 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { Int64 getCurrentColumnCount() const; + bool getFindReplaceEnabled() const; + + void setFindReplaceEnabled( bool findReplaceEnabled ); + protected: struct LastXOffset { TextPosition position; @@ -513,6 +517,7 @@ class EE_API UICodeEditor : public UIWidget, public TextDocument::Client { bool mMinimapDragging{ false }; bool mMinimapHover{ false }; bool mAutoCloseXMLTags{ false }; + bool mFindReplaceEnabled{ true }; TextRange mLinkPosition; String mLink; Uint32 mTabWidth; diff --git a/src/eepp/ui/uicodeeditor.cpp b/src/eepp/ui/uicodeeditor.cpp index ad5e3c305..0aaeebabb 100644 --- a/src/eepp/ui/uicodeeditor.cpp +++ b/src/eepp/ui/uicodeeditor.cpp @@ -523,6 +523,7 @@ void UICodeEditor::disableEditorFeatures() { mHighlightSelectionMatch = false; mEnableColorPickerOnSelection = false; mMinimapEnabled = false; + mFindReplaceEnabled = false; mLineBreakingColumn = 0; } @@ -2609,6 +2610,8 @@ void UICodeEditor::registerCommands() { } void UICodeEditor::findReplace() { + if ( !mFindReplaceEnabled ) + return; if ( nullptr == mFindReplace ) mFindReplace = UIDocFindReplace::New( this, mDoc ); mFindReplace->show(); @@ -3104,6 +3107,14 @@ Int64 UICodeEditor::getCurrentColumnCount() const { return count; } +bool UICodeEditor::getFindReplaceEnabled() const { + return mFindReplaceEnabled; +} + +void UICodeEditor::setFindReplaceEnabled( bool findReplaceEnabled ) { + mFindReplaceEnabled = findReplaceEnabled; +} + Text& UICodeEditor::getLineText( const Int64& lineNumber ) const { auto it = mTextCache.find( lineNumber ); if ( it == mTextCache.end() || it->second.hash != mDoc->line( lineNumber ).getHash() ) {