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

Qt5,Qt6: fixed restoring secondary minimized window. issue #40243

Browse Source 
(cherry picked from commit 107d8dbeae)

Co-authored-by: Željan Rikalo <zeljko@lazarus-ide.org>
This commit is contained in:
Željan Rikalo 2024-11-20 12:19:01 +00:00 committed by Željan Rikalo
parent 0c5d55e65d
commit 40e9db325a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/interfaces/qt5/qtwinapi.inc
View File

@ -2010,7 +2010,6 @@ begin
Result := SIMPLEREGION
else
Result := COMPLEXREGION;
finally
QRegion_destroy(ClipRegion);
QRegion_destroy(Region);
@ -5987,7 +5986,7 @@ begin
{$note this should return current system active window, not
application one, if our app isn''t active.
This is per MSDN and pretty win32 specific}
if WindowManagerName = 'metacity' then
if not IsWayland and (WindowManagerName = 'metacity') then
Result := HwndFromWidgetH(X11GetActivewindow)
else
Result := GetActiveWindow;
@ -6002,7 +6001,9 @@ begin
if HWND <> 0 then
begin
Result := TQtWidget(HWND).IsActiveWindow;
TQtWidget(HWnd).Activate;
if (TQtWidget(Hwnd).getWindowState and QtWindowMinimized) = QtWindowMinimized then
TQtWidget(Hwnd).ShowNormal;
TQtWidget(HWnd).BringToFront;
end;
end;

7
lcl/interfaces/qt6/qtwinapi.inc
View File

@ -2007,7 +2007,6 @@ begin
Result := SIMPLEREGION
else
Result := COMPLEXREGION;
finally
QRegion_destroy(ClipRegion);
QRegion_destroy(Region);
@ -6030,7 +6029,7 @@ begin
{$note this should return current system active window, not
application one, if our app isn''t active.
This is per MSDN and pretty win32 specific}
if WindowManagerName = 'metacity' then
if not IsWayland and (WindowManagerName = 'metacity') then
Result := HwndFromWidgetH(X11GetActivewindow)
else
Result := GetActiveWindow;
@ -6045,7 +6044,9 @@ begin
if HWND <> 0 then
begin
Result := TQtWidget(HWND).IsActiveWindow;
TQtWidget(HWnd).Activate;
if (TQtWidget(Hwnd).getWindowState and QtWindowMinimized) = QtWindowMinimized then
TQtWidget(Hwnd).ShowNormal;
TQtWidget(HWnd).BringToFront;
end;
end;