From 9e40e0dd01b17670891e81ef3126b72072537777 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Wed, 25 Oct 2023 10:21:38 +0000
Subject: [PATCH] RxFPC:RxToolbar - fix draw tools dialog

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8977 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxcontrols/rxtbrsetup.pas | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/components/rx/trunk/rxcontrols/rxtbrsetup.pas b/components/rx/trunk/rxcontrols/rxtbrsetup.pas
index 1af9cf0ae..b2ac82ccb 100644
--- a/components/rx/trunk/rxcontrols/rxtbrsetup.pas
+++ b/components/rx/trunk/rxcontrols/rxtbrsetup.pas
@@ -116,6 +116,7 @@ var
   Offset, TW:integer;
   P:TToolbarItem;
   BtnRect:TRect;
+  Offset1: TPoint;
   Cnv:TCanvas;
   C: TColor;
   S, SText: String;
@@ -142,9 +143,21 @@ begin
         Cnv.Brush.Color := clBtnFace;
         Cnv.FillRect(BtnRect);
         DrawButtonFrame(Cnv, BtnRect, false, false);
-        FToolPanel.ImageList.Draw(Cnv, BtnRect.Left + FToolPanel.DefImgWidth div 2,
+{        FToolPanel.ImageList.Draw(Cnv, BtnRect.Left + FToolPanel.DefImgWidth div 2,
                                        BtnRect.Top + ((BtnRect.Bottom - BtnRect.Top - FToolPanel.DefImgHeight) div 2),
                                        TCustomAction(P.Action).ImageIndex, True);
+}
+
+
+        Offset1.X:= BtnRect.Left + FToolPanel.ImageList.Width div 2;
+        Offset1.Y:= BtnRect.Top + ((BtnRect.Bottom - BtnRect.Top - FToolPanel.DefImgHeight) div 2);
+
+        FToolPanel.ImageList.DrawForPPI(Cnv, Offset1.X, Offset1.Y,
+           TCustomAction(P.Action).ImageIndex,
+           FToolPanel.ImageList.Width,
+           Font.PixelsPerInch,
+           GetCanvasScaleFactor,
+           true);
         Offset:=BtnRect.Right;
       end;
     end;