fix: wrong icon sizes, disable right-click select for column list so selection is kept

ansgarbecker · ansgarbecker · commit a145fc57f076 · 2025-12-04T19:51:54.000+01:00
Prefer TImageList.DrawForControl over .Draw, to get a DPI-scaled image
diff --git a/source/main.pas b/source/main.pas
@@ -1513,7 +1513,7 @@ procedure TMainForm.StatusBarDrawPanel(StatusBar: TStatusBar; Panel: TStatusPane
   PanelRect := Rect;
   //StatusBar.Canvas.FillRect(PanelRect);
   if ImageIndex > -1 then begin
-    ImageListMain.DrawForControl(StatusBar.Canvas, PanelRect.Left, PanelRect.Top+2, ImageIndex, ImageListMain.Width, StatusBar, True);
+    ImageListMain.DrawForControl(StatusBar.Canvas, PanelRect.Left, PanelRect.Top+2, ImageIndex, ImageListMain.Width, StatusBar);
     OffsetRect(PanelRect, Scale96ToForm(ImageListMain.Width)+4, 0);
   end;
   StatusBar.Canvas.TextRect(PanelRect, PanelRect.Left, PanelRect.Top+2, Panel.Text);
@@ -5813,7 +5813,7 @@ procedure TMainForm.AnyGridAdvancedHeaderDraw(Sender: TVTHeader;
     GetSortIndex(PaintInfo.Column, ColSortIndex, ColSortDirection);
     if ColSortIndex > -1 then
       Dec(IconArea.Left, Sender.Images.Width);
-    Sender.Images.Draw(PaintInfo.TargetCanvas, IconArea.Left, IconArea.Top, PaintInfo.Column.ImageIndex);
+    Sender.Images.DrawForControl(PaintInfo.TargetCanvas, IconArea.Left, IconArea.Top, PaintInfo.Column.ImageIndex, Sender.Images.Width, Sender.Treeview);
   end;
 
   // Paint sort icon and number
diff --git a/source/table_editor.lfm b/source/table_editor.lfm
@@ -1081,7 +1081,7 @@ object frmTableEditor: TfrmTableEditor
     TreeOptions.AutoOptions = [toAutoDropExpand, toAutoScrollOnExpand, toAutoTristateTracking, toAutoChangeScale]
     TreeOptions.MiscOptions = [toAcceptOLEDrop, toCheckSupport, toEditable, toFullRepaintOnResize, toGridExtensions, toInitOnSave, toWheelPanning, toFullRowDrag, toEditOnClick]
     TreeOptions.PaintOptions = [toHotTrack, toShowDropmark, toShowHorzGridLines, toShowVertGridLines, toThemeAware, toUseBlendedImages, toUseExplorerTheme, toHideTreeLinesIfThemed]
-    TreeOptions.SelectionOptions = [toExtendedFocus, toFullRowSelect, toMultiSelect, toRightClickSelect]
+    TreeOptions.SelectionOptions = [toExtendedFocus, toFullRowSelect, toMultiSelect]
     WantTabs = True
     OnAfterCellPaint = listColumnsAfterCellPaint
     OnBeforeCellPaint = listColumnsBeforeCellPaint
diff --git a/source/table_editor.pas b/source/table_editor.pas
@@ -1276,8 +1276,8 @@ procedure TfrmTableEditor.listColumnsAfterCellPaint(Sender: TBaseVirtualTree;
     X := 0;
     ImageIndexes := GetKeyImageIndexes(Col^);
     for i in ImageIndexes do begin
-      VT.Images.Draw(TargetCanvas, X, Y, i);
-      Inc(X, VT.Images.Width);
+      VT.Images.DrawForControl(TargetCanvas, X, Y, i, VT.Images.Width, VT);
+      Inc(X, Scale96ToForm(VT.Images.Width));
     end;
     ImageIndexes.Free;
   end;
@@ -1299,7 +1299,7 @@ procedure TfrmTableEditor.listColumnsAfterCellPaint(Sender: TBaseVirtualTree;
       else ImageIndex := 175;
     end;
     X := CellRect.Left + (VT.Header.Columns[Column].Width div 2) - (VT.Images.Width div 2);
-    VT.Images.Draw(TargetCanvas, X, Y, ImageIndex);
+    VT.Images.DrawForControl(TargetCanvas, X, Y, ImageIndex, VT.Images.Width, VT);
   end;
 end;
 
