pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

RxFPC:fix draw HiRes icons on RxToolBar

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8967 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
alexs75
2023-10-16 06:06:18 +00:00
parent 7a096dcf83
commit 1e5809a8cc
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
components/rx/trunk/rxcontrols/rxtoolbar.pas
View File

@ -578,7 +578,7 @@ begin
if ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) and (not Assigned(FImgS)) and (tpGlyphPopup in ToolPanel.Options) and FFullPush then if ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) and (not Assigned(FImgS)) and (tpGlyphPopup in ToolPanel.Options) and FFullPush then
begin begin
{$IF LCL_FullVersion >= 1080000} {.$IF LCL_FullVersion >= 1080000}
//FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y, //FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y,
FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y, FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y,
TCustomAction(Action).ImageIndex, TCustomAction(Action).ImageIndex,
@ -586,28 +586,28 @@ begin
Font.PixelsPerInch, Font.PixelsPerInch,
GetCanvasScaleFactor, GetCanvasScaleFactor,
gdeShadowed); gdeShadowed);
{$ELSE} {.$ELSE}
FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gde1Bit); // FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, gde1Bit);
{$ENDIF} {.$ENDIF}
Dec(Offset.X, 2); Dec(Offset.X, 2);
Dec(Offset.Y, 2); Dec(Offset.Y, 2);
end; end;
if Assigned(FImgS) and (FImgS.Count>TCustomAction(Action).ImageIndex) and ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) then if Assigned(FImgS) and (FImgS.Count>TCustomAction(Action).ImageIndex) and ((FLastDrawFlagsA and DFCS_FLAT) <> 0) and ((FLastDrawFlagsA and DFCS_PUSHED) = 0) then
begin begin
{$IF LCL_FullVersion >= 1080000} {.$IF LCL_FullVersion >= 1080000}
FImgS.DrawForPPI(Canvas, Offset.X, Offset.Y, FImgS.DrawForPPI(Canvas, Offset.X, Offset.Y,
TCustomAction(Action).ImageIndex, TCustomAction(Action).ImageIndex,
FImgS.Width, FImgS.Width,
Font.PixelsPerInch, Font.PixelsPerInch,
GetCanvasScaleFactor, GetCanvasScaleFactor,
(FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled); (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
{$ELSE} {.$ELSE}
FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled) // FImgS.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled)
{$ENDIF} {.$ENDIF}
end end
else else
{$IF LCL_FullVersion >= 1080000} {.$IF LCL_FullVersion >= 1080000}
//FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y, //FImageList.DrawForPPI(Canvas, Offset.X, Offset.Y,
FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y, FImgN.DrawForPPI(Canvas, Offset.X, Offset.Y,
TCustomAction(Action).ImageIndex, TCustomAction(Action).ImageIndex,
@ -615,9 +615,9 @@ begin
Font.PixelsPerInch, Font.PixelsPerInch,
GetCanvasScaleFactor, GetCanvasScaleFactor,
(FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled); (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
{$ELSE} {.$ELSE}
FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled); // FImageList.Draw(Canvas, Offset.X, Offset.Y, TCustomAction(Action).ImageIndex, (FToolbarButtonStyle = tbrDropDown) or TCustomAction(Action).Enabled);
{$ENDIF} {.$ENDIF}
end end
else else
begin begin