vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <[email protected]> | Sun Feb 15 23:49:32 2015 +0100| [dcd71f016e2469e509af0df665bca69bf1b3c00d] | committer: Jean-Baptiste Kempf
Qt: fix always on top deactivation on Windows See QTBUG-30359 Close #13646 (cherry picked from commit d88172ad44e3d5570df49d3a46638f123c80b72c) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=dcd71f016e2469e509af0df665bca69bf1b3c00d --- contrib/src/qt/Win32-AOT.patch | 11 +++++++++++ contrib/src/qt/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/qt/Win32-AOT.patch b/contrib/src/qt/Win32-AOT.patch new file mode 100644 index 0000000..145235b --- /dev/null +++ b/contrib/src/qt/Win32-AOT.patch @@ -0,0 +1,11 @@ +--- 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); diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 93a476d..4929d95 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -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 _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
