paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-01 13:20:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

gtk3: fixed images on buttons. Patch by Anton Kavalenka.

Browse Source 
git-svn-id: trunk@62166 -
This commit is contained in:
zeljko 2019-11-03 15:14:27 +00:00
parent a0ad23f644
commit fb966c9408
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lcl/interfaces/gtk3/gtk3wsbuttons.pp
View File

@ -72,7 +72,7 @@ type
implementation implementation
uses uses
LResources, gtk3objects, gtk3procs; graphtype,imglist,LResources, gtk3objects, gtk3procs;
{ TGtk3WSCustomBitBtn } { TGtk3WSCustomBitBtn }
@ -115,17 +115,46 @@ class procedure TGtk3WSBitBtn.SetGlyph(const ABitBtn: TCustomBitBtn;
const AValue: TButtonGlyph); const AValue: TButtonGlyph);
var var
AImage: PGtkImage; AImage: PGtkImage;
AGlyph: TBitmap;
resolution:TCustomImageListResolution;
ScaleFactor: Double;
raw:TRawImage;
begin begin
{$IFDEF GTK3DEBUGCORE} {$IFDEF GTK3DEBUGCORE}
DebugLn('TGtk3WSBitBtn.SetGlyph'); DebugLn('TGtk3WSBitBtn.SetGlyph');
{$ENDIF} {$ENDIF}
if not WSCheckHandleAllocated(ABitBtn, 'SetGlyph') then if not WSCheckHandleAllocated(ABitBtn, 'SetGlyph') then
Exit; Exit;
if ABitBtn.CanShowGlyph then if ABitBtn.CanShowGlyph(True) then
AImage := gtk_image_new_from_pixbuf(TGtk3Image(ABitBtn.Glyph.Handle).Handle) begin
{ allocate image which would be cached in TGtk3Button instance }
AGlyph := TBitmap.Create;
ScaleFactor := ABitBtn.GetCanvasScaleFactor;
if (ABitBtn.ImageIndex>=0) and Assigned(ABitBtn.Images) then
begin
{ find imagelist scaled}
resolution:=ABitBtn.Images.Resolution[round(AbitBtn.Images.Width*ScaleFactor)];
resolution.GetRawImage(ABitBtn.ImageIndex,raw);
{ convice the bitmap it has actually another format }
AGlyph.BeginUpdate();
raw.Description.Init_BPP32_R8G8B8A8_BIO_TTB(resolution.Width,resolution.Height);
AGlyph.LoadFromRawImage(raw,false);
AGlyph.EndUpdate();
end else
AGlyph.Assign(AValue.Glyph);
if not AGlyph.Empty then
AImage := gtk_image_new_from_pixbuf(TGtk3Image(AGlyph.Handle).Handle)
else else
AImage := nil; AImage := nil;
gtk_button_set_image(PGtkButton(TGtk3Button(ABitBtn.Handle).Widget), AImage); if Assigned(AImage) then
gtk_button_set_image(PGtkButton(TGtk3Button(ABitBtn.Handle).Widget), AImage)
else
PGtkButton(TGtk3Button(ABitBtn.Handle).Widget)^.always_show_image:=false;
{ store glyph to prevent leaks }
TGtk3Button(ABitBtn.Handle).Image:=AGlyph;
end;
end; end;
class procedure TGtk3WSBitBtn.SetLayout(const ABitBtn: TCustomBitBtn; class procedure TGtk3WSBitBtn.SetLayout(const ABitBtn: TCustomBitBtn;