paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 18:30:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: TCustomBitBtn: do not store Glyph when set by Action, issue #27358, from BBaz

Browse Source 
git-svn-id: trunk@47523 -
This commit is contained in:
mattias 2015-01-26 11:02:42 +00:00
parent 7832ffec7f
commit 04725947e0
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lcl/include/bitbtn.inc
View File

@ -100,10 +100,20 @@ begin
end; end;
function TCustomBitBtn.IsGlyphStored: Boolean; function TCustomBitBtn.IsGlyphStored: Boolean;
var
act: TCustomAction;
begin begin
Result := (Kind = bkCustom) and (FButtonGlyph.Glyph <> nil) if Action <> nil then
and (not FButtonGlyph.Glyph.Empty) begin
and (FButtonGlyph.Glyph.Width>0) and (FButtonGlyph.Glyph.Height>0); result := true;
act := TCustomAction(Action);
if (act.ActionList <> nil) and (act.ActionList.Images <> nil) and
(act.ImageIndex >= 0) and (act.ImageIndex < act.ActionList.Images.Count) then
result := false;
end
else Result := (Kind = bkCustom) and (FButtonGlyph.Glyph <> nil)
and (not FButtonGlyph.Glyph.Empty)
and (FButtonGlyph.Glyph.Width>0) and (FButtonGlyph.Glyph.Height>0);
end; end;
procedure TCustomBitBtn.SetGlyph(AValue: TBitmap); procedure TCustomBitBtn.SetGlyph(AValue: TBitmap);