From cf2dc8d6f34b9b8f7a723d49d1fe9aa09b923daa Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Fri, 12 Aug 2022 13:49:24 +0200 Subject: [PATCH] Remove support for min button in QWasmWindow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Minimizing windows is not supported on Wasm. The button has also never been drawn, so remove the code that supports its hit test. Change-Id: Ic1c26f1036aa9c7d65c8c61b7fd47ecce32889ca Pick-to: 6.4 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmwindow.cpp | 7 +------ src/plugins/platforms/wasm/qwasmwindow.h | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 54c174e9742..99803e5d207 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -223,8 +223,6 @@ void QWasmWindow::injectMousePressed(const QPoint &local, const QPoint &global, const auto options = makeTitleBarOptions(); if (getTitleBarControlRect(options, SC_TitleBarMaxButton).contains(pointInFrameCoords)) m_activeControl = SC_TitleBarMaxButton; - else if (getTitleBarControlRect(options, SC_TitleBarMinButton).contains(pointInFrameCoords)) - m_activeControl = SC_TitleBarMinButton; else if (getTitleBarControlRect(options, SC_TitleBarCloseButton).contains(pointInFrameCoords)) m_activeControl = SC_TitleBarCloseButton; else if (getTitleBarControlRect(options, SC_TitleBarNormalButton).contains(pointInFrameCoords)) @@ -359,9 +357,7 @@ QRect QWasmWindow::getTitleBarControlRect(const TitleBarOptions &tb, TitleBarCon } break; case SC_TitleBarNormalButton: - if (isMinimized && (tb.flags & Qt::WindowMinimizeButtonHint)) { - offset += delta; - } else if (isMaximized && (tb.flags & Qt::WindowMaximizeButtonHint)) { + if (isMaximized && (tb.flags & Qt::WindowMaximizeButtonHint)) { ret.adjust(0, 0, -delta * 2, 0); offset += (delta + delta); } @@ -395,7 +391,6 @@ QRegion QWasmWindow::titleControlRegion() const QRegion result; const auto options = makeTitleBarOptions(); result += getTitleBarControlRect(options, SC_TitleBarCloseButton); - result += getTitleBarControlRect(options, SC_TitleBarMinButton); result += getTitleBarControlRect(options, SC_TitleBarMaxButton); result += getTitleBarControlRect(options, SC_TitleBarSysMenu); diff --git a/src/plugins/platforms/wasm/qwasmwindow.h b/src/plugins/platforms/wasm/qwasmwindow.h index 7dd0a0d1024..3ec1f3405e7 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.h +++ b/src/plugins/platforms/wasm/qwasmwindow.h @@ -19,11 +19,10 @@ public: enum TitleBarControl { SC_None = 0x00000000, SC_TitleBarSysMenu = 0x00000001, - SC_TitleBarMinButton = 0x00000002, - SC_TitleBarMaxButton = 0x00000004, - SC_TitleBarCloseButton = 0x00000008, - SC_TitleBarNormalButton = 0x00000010, - SC_TitleBarLabel = 0x00000100 + SC_TitleBarMaxButton = 0x00000002, + SC_TitleBarCloseButton = 0x00000004, + SC_TitleBarNormalButton = 0x00000008, + SC_TitleBarLabel = 0x00000010 }; Q_DECLARE_FLAGS(TitleBarControls, TitleBarControl);