Commit dcd71f01 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt: fix always on top deactivation on Windows

See QTBUG-30359
Close #13646

(cherry picked from commit d88172ad44e3d5570df49d3a46638f123c80b72c)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 9c8721d8
--- qt/src/plugins/platforms/windows/qwindowswindow.cpp.old 2015-02-15 21:05:36.302825488 +0100
+++ qt/src/plugins/platforms/windows/qwindowswindow.cpp 2015-02-15 21:06:11.562824592 +0100
@@ -651,7 +651,7 @@
} else if (flags & Qt::WindowStaysOnBottomHint) {
SetWindowPos(hwnd, HWND_BOTTOM, 0, 0, 0, 0, swpFlags);
} else if (frameChange) { // Force WM_NCCALCSIZE with wParam=1 in case of custom margins.
- SetWindowPos(hwnd, 0, 0, 0, 0, 0, swpFlags);
+ SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, swpFlags);
}
if (flags & (Qt::CustomizeWindowHint|Qt::WindowTitleHint)) {
HMENU systemMenu = GetSystemMenu(hwnd, FALSE);
......@@ -24,6 +24,7 @@ $(TARBALLS)/qt-$(QT_VERSION).tar.xz:
qt: qt-$(QT_VERSION).tar.xz .sum-qt
$(UNPACK)
mv qtbase-opensource-src-$(QT_VERSION) qt-$(QT_VERSION)
$(APPLY) $(SRC)/qt/Win32-AOT.patch
$(MOVE)
ifdef HAVE_MACOSX
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment