Quick find bar: do not show the find/replace history menu if there is…

… none Quick find bar: when choosing entry from the history menu, place the caret after the text inserted Signed-off-by: Eran Ifrah <[email protected]>
eranif · Jan 11, 2025 · af98376 · af98376
1 parent 6f7ec18
commit af98376
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/LiteEditor/quickfindbar.cpp b/LiteEditor/quickfindbar.cpp
@@ -1137,6 +1137,9 @@ bool QuickFindBar::HandleKeyboardShortcuts(wxKeyEvent& event)
 
 void QuickFindBar::ShowMenuForFindCtrl()
 {
+    if (m_findHistory.m_commands.empty()) {
+        return;
+    }
     wxMenu menu;
     for (const auto& word : m_findHistory.m_commands) {
         int resource_id = wxXmlResource::GetXRCID(word);
@@ -1146,6 +1149,7 @@ void QuickFindBar::ShowMenuForFindCtrl()
             [this, word](wxCommandEvent& event) {
                 wxUnusedVar(event);
                 m_textCtrlFind->SetValue(word);
+                m_textCtrlFind->SetInsertionPointEnd();
             },
             resource_id);
     }
@@ -1155,6 +1159,10 @@ void QuickFindBar::ShowMenuForFindCtrl()
 
 void QuickFindBar::ShowMenuForReplaceCtrl()
 {
+    if (m_replaceHistory.m_commands.empty()) {
+        return;
+    }
+
     wxMenu menu;
     for (const auto& word : m_replaceHistory.m_commands) {
         int resource_id = wxXmlResource::GetXRCID(word);
@@ -1164,6 +1172,7 @@ void QuickFindBar::ShowMenuForReplaceCtrl()
             [this, word](wxCommandEvent& event) {
                 wxUnusedVar(event);
                 m_textCtrlReplace->SetValue(word);
+                m_textCtrlReplace->SetInsertionPointEnd();
             },
             resource_id);
     }