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

Qt,Qt5: fixed changing TMenuItem.ImageIndex inside main menu. issue #37608

Browse Source
This commit is contained in:
Željan Rikalo 2021-08-28 19:26:29 +02:00
parent 31c207d9ed
commit fcf361530d
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lcl/interfaces/qt/qtwsmenus.pp
View File

@ -398,13 +398,10 @@ end;
class procedure TQtWSMenuItem.UpdateMenuIcon(const AMenuItem: TMenuItem; class procedure TQtWSMenuItem.UpdateMenuIcon(const AMenuItem: TMenuItem;
const HasIcon: Boolean; const AIcon: TBitmap); const HasIcon: Boolean; const AIcon: TBitmap);
begin begin
if not WSCheckMenuItem(AMenuItem, 'UpdateMenuIcon') then
Exit;
if AMenuItem.HasParent then if AMenuItem.HasParent then
begin AMenuItem.RecreateHandle;
if HasIcon then
TQtMenu(AMenuItem.Handle).setImage(TQtImage(AIcon.Handle))
else
TQtMenu(AMenuItem.Handle).setImage(nil);
end;
end; end;
{ TQtWSMenu } { TQtWSMenu }

9
lcl/interfaces/qt5/qtwsmenus.pp
View File

@ -397,13 +397,10 @@ end;
class procedure TQtWSMenuItem.UpdateMenuIcon(const AMenuItem: TMenuItem; class procedure TQtWSMenuItem.UpdateMenuIcon(const AMenuItem: TMenuItem;
const HasIcon: Boolean; const AIcon: TBitmap); const HasIcon: Boolean; const AIcon: TBitmap);
begin begin
if not WSCheckMenuItem(AMenuItem, 'UpdateMenuIcon') then
Exit;
if AMenuItem.HasParent then if AMenuItem.HasParent then
begin AMenuItem.RecreateHandle;
if HasIcon then
TQtMenu(AMenuItem.Handle).setImage(TQtImage(AIcon.Handle))
else
TQtMenu(AMenuItem.Handle).setImage(nil);
end;
end; end;
{ TQtWSMenu } { TQtWSMenu }