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

LCL: Revert 0c285d6eb9 (fixes issue #39861).

Browse Source
This commit is contained in:
wp_xyz 2022-08-17 22:59:27 +02:00
parent b75a7c1e81
commit 7950515229
2 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/buttonpanel.pas
View File

@ -92,7 +92,6 @@ type
AlignInfo: TAlignInfo); override; AlignInfo: TAlignInfo); override;
procedure CalculatePreferredSize(var PreferredWidth, procedure CalculatePreferredSize(var PreferredWidth,
PreferredHeight: integer; WithThemeSpace: Boolean); override; PreferredHeight: integer; WithThemeSpace: Boolean); override;
procedure Loaded; override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure SetAlign(Value: TAlign); override; procedure SetAlign(Value: TAlign); override;
procedure CMAppShowBtnGlyphChanged(var Message: TLMessage); message CM_APPSHOWBTNGLYPHCHANGED; procedure CMAppShowBtnGlyphChanged(var Message: TLMessage); message CM_APPSHOWBTNGLYPHCHANGED;
@ -486,12 +485,6 @@ begin
end; end;
end; end;
procedure TCustomButtonPanel.Loaded;
begin
inherited;
DoShowGlyphs;
end;
procedure TCustomButtonPanel.Notification(AComponent: TComponent; procedure TCustomButtonPanel.Notification(AComponent: TComponent;
Operation: TOperation); Operation: TOperation);
var var

12
lcl/include/bitbtn.inc
View File

@ -315,17 +315,7 @@ begin
idButton := BitBtnImages[Kind]; idButton := BitBtnImages[Kind];
if (idButton >= Low(BitBtnResNames)) and (idButton <= High(BitBtnResNames)) if (idButton >= Low(BitBtnResNames)) and (idButton <= High(BitBtnResNames))
and (BitBtnResNames[idButton] <> '') then and (BitBtnResNames[idButton] <> '') then
begin FButtonGlyph.LCLGlyphName := BitBtnResNames[idButton]
FButtonGlyph.LCLGlyphName := BitBtnResNames[idButton];
CustomGlyph := GetLCLDefaultBtnGlyph(Kind);
try
if not Assigned(Glyph) then
Glyph := TBitmap.Create;
Glyph.Assign(CustomGlyph);
finally
CustomGlyph.Free;
end;
end
else else
ImageIndex := -1; ImageIndex := -1;
GlyphValid := True; GlyphValid := True;