Give focus back when blind search is attempted

aardappel · Sep 14, 2024 · 2ac76d8 · 2ac76d8
1 parent ce31cc6
commit 2ac76d8
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/myframe.h b/src/myframe.h
@@ -1072,13 +1072,16 @@ struct MyFrame : wxFrame {
     }
 
     void OnSearch(wxCommandEvent &ce) {
-        if (!sys->showtoolbar) return;
+        TSCanvas *sw = GetCurTab();
+        if (!sys->showtoolbar) {
+            sw->SetFocus();
+            return;
+        }
         wxString searchstring = ce.GetString();
         sys->darkennonmatchingcells = searchstring.Len() != 0;
         sys->searchstring = (sys->casesensitivesearch) ? searchstring : searchstring.Lower();
         SetSearchTextBoxBackgroundColour(false);
         Document *doc = GetCurTab()->doc;
-        TSCanvas *sw = GetCurTab();
         wxClientDC dc(sw);
         doc->SearchNext(dc, false, false, false);
         if (doc->searchfilter) {
@@ -1089,8 +1092,11 @@ struct MyFrame : wxFrame {
     }
 
     void OnSearchReplaceEnter(wxCommandEvent &ce) {
-        if (!sys->showtoolbar) return;
         TSCanvas *sw = GetCurTab();
+        if (!sys->showtoolbar) {
+            sw->SetFocus();
+            return;
+        }
         if (ce.GetId() == A_SEARCH && ce.GetString().Len() == 0) {
             sw->SetFocus();
         } else {