From 2fd5a598d4423fe15afae023154034c4224d7808 Mon Sep 17 00:00:00 2001
From: alexs75 <alexs75@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Tue, 2 Jul 2019 10:50:01 +0000
Subject: [PATCH] RxFPC:TRxToolBar - fix draw image for dropdown button

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7021 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/rx/trunk/rxcontrols/rxtoolbar.pas | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/rx/trunk/rxcontrols/rxtoolbar.pas b/components/rx/trunk/rxcontrols/rxtoolbar.pas
index 6bd3fa1a7..d543f583a 100644
--- a/components/rx/trunk/rxcontrols/rxtoolbar.pas
+++ b/components/rx/trunk/rxcontrols/rxtoolbar.pas
@@ -601,9 +601,9 @@ begin
          FImgS.Width,
          Font.PixelsPerInch,
          GetCanvasScaleFactor,
-         TCustomAction(Action).Enabled);
+         (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
       {$ELSE}
-      FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, TCustomAction(Action).Enabled)
+      FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled)
       {$ENDIF}
     end
     else
@@ -614,9 +614,9 @@ begin
          FImgN.Width,
          Font.PixelsPerInch,
          GetCanvasScaleFactor,
-         TCustomAction(Action).Enabled);
+         (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
     {$ELSE}
-      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, TCustomAction(Action).Enabled);
+      FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
     {$ENDIF}
   end
   else