paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 23:19:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: fixed TSpeedButton with Action and changing Action.ImageIndex

Browse Source
This commit is contained in:
mattias 2021-11-05 11:47:57 +01:00
parent c8bfe6c6cd
commit adafca05c0
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/include/speedbutton.inc
View File

@ -432,8 +432,10 @@ begin
if (NewAct.ActionList = nil) or (NewAct.ImageIndex < 0) then Exit; if (NewAct.ActionList = nil) or (NewAct.ImageIndex < 0) then Exit;
Imgs := NewAct.ActionList.Images; Imgs := NewAct.ActionList.Images;
if (Imgs = nil) or (NewAct.ImageIndex >= Imgs.Count) then Exit; if (Imgs = nil) or (NewAct.ImageIndex >= Imgs.Count) then Exit;
ImgRes := Imgs.ResolutionForPPI[ImageWidth,Font.PixelsPerInch,GetCanvasScaleFactor]; Images := Imgs;
ImgRes.GetBitmap(NewAct.ImageIndex, Glyph); ImageIndex := NewAct.ImageIndex;
//ImgRes := Imgs.ResolutionForPPI[ImageWidth,Font.PixelsPerInch,GetCanvasScaleFactor];
//ImgRes.GetBitmap(NewAct.ImageIndex, Glyph);
end; end;
end; end;
@ -488,13 +490,13 @@ function TCustomSpeedButton.IsGlyphStored: Boolean;
var var
act: TCustomAction; act: TCustomAction;
begin begin
result := true; Result := true;
if Action <> nil then if Action <> nil then
begin begin
act := TCustomAction(Action); act := TCustomAction(Action);
if (act.ActionList <> nil) and (act.ActionList.Images <> nil) and if (act.ActionList <> nil) and (act.ActionList.Images <> nil) and
(act.ImageIndex >= 0) and (act.ImageIndex < act.ActionList.Images.Count) then (act.ImageIndex >= 0) and (act.ImageIndex < act.ActionList.Images.Count) then
result := false; Result := false;
end; end;
end; end;
@ -502,7 +504,7 @@ procedure TCustomSpeedButton.SetShowCaption(const AValue: boolean);
begin begin
if FShowCaption=AValue then exit; if FShowCaption=AValue then exit;
FShowCaption:=AValue; FShowCaption:=AValue;
invalidate; Invalidate;
end; end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------