feat: switch to grayscale icons on inactive query tabs

ansgarbecker · ansgarbecker · commit 917e04624eaa · 2025-12-08T18:52:01.000+01:00
diff --git a/source/apphelpers.pas b/source/apphelpers.pas
@@ -9,7 +9,7 @@ interface
   StrUtils, Graphics, GraphUtil, LCLIntf, Forms, Clipbrd, Process, ActnList, Menus, Dialogs,
   Character, DateUtils, laz.VirtualTrees, SynEdit, SynCompletion, fphttpclient,
   dbconnection, dbstructures, jsonregistry, lazaruscompat, fpjson, SynEditKeyCmds, LazFileUtils, gettext, LazUTF8, LConvEncoding,
-  IniFiles;
+  IniFiles, GraphType;
 
 type
 
@@ -435,7 +435,7 @@   TAppSettings = class(TObject)
   function GetCommandLine: String;
   // This returns a stable, lowercase name "heidisql", used for configuration files and translations
   function GetApplicationName: String;
-  procedure CopyImageList(SourceList, TargetList: TImageList);
+  procedure CopyImageList(SourceList, TargetList: TImageList; AppendDisabled: Boolean);
 
 var
   AppSettings: TAppSettings;
@@ -3147,7 +3147,7 @@ function GetApplicationName: String;
   Result := LowerCase(APPNAME);
 end;
 
-procedure CopyImageList(SourceList, TargetList: TImageList);
+procedure CopyImageList(SourceList, TargetList: TImageList; AppendDisabled: Boolean);
 var
   i, ResIdx, ResWidth: Integer;
   TempBitmap: TBitmap;
@@ -3170,6 +3170,20 @@ procedure CopyImageList(SourceList, TargetList: TImageList);
     end;
     TargetList.AddMultipleResolutions(TempBitmapList);
   end;
+  if AppendDisabled then begin
+    for i:=0 to SourceList.Count-1 do
+    begin
+      SetLength(TempBitmapList, 0);
+      SetLength(TempBitmapList, Length(Resolutions));
+      for ResIdx:=Low(Resolutions) to High(Resolutions) do begin
+        ResWidth := Resolutions[ResIdx];
+        TempBitmap := TBitmap.Create;
+        SourceList.Resolution[ResWidth].GetBitmap(i, TempBitmap, gdeDisabled);
+        TempBitmapList[ResIdx] := TempBitmap;
+      end;
+      TargetList.AddMultipleResolutions(TempBitmapList);
+    end;
+  end;
 end;
 
 
diff --git a/source/extra_controls.pas b/source/extra_controls.pas
@@ -407,19 +407,17 @@ class function TExtForm.ScaleSize(x: Extended; Control: TControl): Integer;
 class procedure TExtForm.PageControlTabHighlight(PageControl: TPageControl);
 var
   i, CurrentImage, CountOriginals: Integer;
-  Images: TImageList;
+  Images: TCustomImageList;
   GrayscaleMode: Integer;
   IsQueryTab: Boolean;
 begin
-  // Unsupported yet. We have no TVirtualImageList, see MainForm.PrepareImageList
-  Exit;
   // Set grayscale icon on inactive tabs
   if not (PageControl.Images is TImageList) then
     Exit;
   GrayscaleMode := AppSettings.ReadInt(asTabIconsGrayscaleMode);
 
-  Images := PageControl.Images as TImageList;
-  CountOriginals := Images.Count;
+  Images := PageControl.Images;
+  CountOriginals := Images.Count div 2;
 
   for i:=0 to PageControl.PageCount-1 do begin
     CurrentImage := PageControl.Pages[i].ImageIndex;
@@ -437,7 +435,7 @@ class procedure TExtForm.PageControlTabHighlight(PageControl: TPageControl);
           PageControl.Pages[i].ImageIndex := CurrentImage + CountOriginals;
       end;
     end;
-  end;;
+  end;
 end;
 
 class procedure TExtForm.ShowPopup(ClickedControl: TControl; PopupMenu: TPopupMenu);
diff --git a/source/main.pas b/source/main.pas
@@ -9239,16 +9239,15 @@ procedure TMainForm.PrepareImageList;
 begin
   // Load preferred ImageList into ImageListMain
   if ImageListIcons8.Count = 0 then begin
-    CopyImageList(ImageListMain, ImageListIcons8);
+    CopyImageList(ImageListMain, ImageListIcons8, False);
   end;
   IconPack := AppSettings.ReadString(asIconPack);
   WantedImageCollection := FindComponent('ImageList' + IconPack);
   if (WantedImageCollection <> nil) and (WantedImageCollection is TImageList) and (WantedImageCollection.Tag <> 0) then begin
     SourceList := WantedImageCollection as TImageList;
-    CopyImageList(SourceList, ImageListMain);
+    // Add all icons again in disabled/grayscale mode, used in TExtForm.PageControlTabHighlight
+    CopyImageList(SourceList, ImageListMain, True);
   end;
-  // Add all icons again in disabled/grayscale mode, used in TExtForm.PageControlTabHighlight
-  //VirtualImageListMain.AddDisabled('', 0, VirtualImageListMain.ImageCollection.Count-1);
 end;
 
 
