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

Qt5: fixed TMainMenu submenus positioning under Wayland. issue #40602

Browse Source
This commit is contained in:
Željan Rikalo 2023-11-17 23:03:26 +01:00
parent 4b6c4e06e3
commit 4b1a81ac7b
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lcl/interfaces/qt5/qtwidgets.pas
View File

@ -16081,6 +16081,14 @@ begin
Parent := TQtWidget(AParams.WndParent).GetContainerWidget Parent := TQtWidget(AParams.WndParent).GetContainerWidget
else else
Parent := nil; Parent := nil;
{$IFDEF HASX11}
// issue #40602
if IsWayland and Assigned(FMenuItem) and FMenuItem.HasParent and not FMenuItem.Parent.HasParent and
(FMenuItem.GetParentMenu is TMainMenu) then
Parent := TQtMainWindow(Application.MainForm.Handle).MenuBarNeeded.Widget;
{$ENDIF}
Result := QMenu_create(Parent); Result := QMenu_create(Parent);
FDeleteLater := True; FDeleteLater := True;
FActionHandle := nil; FActionHandle := nil;