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

Qt, Qt5: fix crash if glyph is available but hidden with ShowMode

Browse Source 
git-svn-id: trunk@57921 -
This commit is contained in:
ondrej 2018-05-13 12:28:28 +00:00
parent 04805d25f4
commit 1687a7b56a
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lcl/buttons.pp
View File

@ -199,7 +199,7 @@ type
procedure LoadGlyphFromResourceName(Instance: THandle; const AName: String); procedure LoadGlyphFromResourceName(Instance: THandle; const AName: String);
procedure LoadGlyphFromLazarusResource(const AName: String); procedure LoadGlyphFromLazarusResource(const AName: String);
procedure LoadGlyphFromStock(idButton: Integer); procedure LoadGlyphFromStock(idButton: Integer);
function CanShowGlyph: Boolean; function CanShowGlyph(const AWithShowMode: Boolean = False): Boolean;
public public
property Caption stored IsCaptionStored; property Caption stored IsCaptionStored;
property DefaultCaption: Boolean read FDefaultCaption write FDefaultCaption default False; property DefaultCaption: Boolean read FDefaultCaption write FDefaultCaption default False;

4
lcl/include/bitbtn.inc
View File

@ -90,9 +90,11 @@ begin
Images := nil; Images := nil;
end; end;
function TCustomBitBtn.CanShowGlyph: Boolean; function TCustomBitBtn.CanShowGlyph(const AWithShowMode: Boolean): Boolean;
begin begin
Result := FButtonGlyph.CanShowGlyph; Result := FButtonGlyph.CanShowGlyph;
if AWithShowMode then
Result := Result and FButtonGlyph.CanShow;
end; end;
function TCustomBitBtn.GetGlyph : TBitmap; function TCustomBitBtn.GetGlyph : TBitmap;

2
lcl/interfaces/qt/qtwsbuttons.pp
View File

@ -99,7 +99,7 @@ begin
TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout); TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout);
AIcon := QIcon_create(); AIcon := QIcon_create();
if ABitBtn.CanShowGlyph then if ABitBtn.CanShowGlyph(True) then
begin begin
AGlyph := TBitmap.Create; AGlyph := TBitmap.Create;
APixmap := QPixmap_create(); APixmap := QPixmap_create();

2
lcl/interfaces/qt5/qtwsbuttons.pp
View File

@ -98,7 +98,7 @@ begin
TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout); TQtBitBtn(ABitBtn.Handle).GlyphLayout := Ord(ABitBtn.Layout);
AIcon := QIcon_create(); AIcon := QIcon_create();
if ABitBtn.CanShowGlyph then if ABitBtn.CanShowGlyph(True) then
begin begin
AGlyph := TBitmap.Create; AGlyph := TBitmap.Create;
APixmap := QPixmap_create(); APixmap := QPixmap_create();