From bf31dfc7d7e2fed74c1af7f495cfbf8015c62542 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 4 Jun 2021 14:30:43 +0200
Subject: [PATCH] Refactor: merge both overloaded TQueryTabList.TabByControl
 methods into a generic one, which accepts any TWinControl descendant

---
 source/main.pas | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/source/main.pas b/source/main.pas
index bf38d71a..554f17e3 100644
--- a/source/main.pas
+++ b/source/main.pas
@@ -134,8 +134,7 @@ type
       function ActiveMemo: TSynMemo;
       function ActiveHelpersTree: TVirtualStringTree;
       function TabByNumber(Number: Integer): TQueryTab;
-      function TabByControl(HelpersTree: TBaseVirtualTree): TQueryTab; overload;
-      function TabByControl(Memo: TSynMemo): TQueryTab; overload;
+      function TabByControl(Control: TWinControl): TQueryTab;
   end;
 
   TQueryHistoryItem = class(TObject)
@@ -14293,29 +14292,19 @@ begin
 end;
 
 
-function TQueryTabList.TabByControl(HelpersTree: TBaseVirtualTree): TQueryTab;
+function TQueryTabList.TabByControl(Control: TWinControl): TQueryTab;
 var
   Tab: TQueryTab;
 begin
-  // Find query tab where passed treeHelpers resides
+  // Find query tab where passed control resides
+  // Supports only most important controls in the upper area, excluding tab close button and result grid
   Result := nil;
   for Tab in Self do begin
-    if Tab.treeHelpers = HelpersTree then begin
-      Result := Tab;
-      Break;
-    end;
-  end;
-end;
-
-
-function TQueryTabList.TabByControl(Memo: TSynMemo): TQueryTab;
-var
-  Tab: TQueryTab;
-begin
-  // Find tab where passed memo resides
-  Result := nil;
-  for Tab in Self do begin
-    if Tab.Memo = Memo then begin
+    if (Control = Tab.TabSheet)
+      or (Control = Tab.pnlMemo) or (Control = Tab.Memo)
+      or (Control = Tab.pnlHelpers) or (Control = Tab.filterHelpers) or (Control = Tab.treeHelpers)
+      or (Control = Tab.tabsetQuery)
+      then begin
       Result := Tab;
       Break;
     end;