From f9bf0be85467f9691dfc03402000630832312443 Mon Sep 17 00:00:00 2001 From: Mikolaj Boc Date: Thu, 2 Feb 2023 08:59:26 +0100 Subject: [PATCH] Support Qt::WindowCloseButtonHint in QWasmWindow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I1cd74e5c9e73c2585d3da3fa0ee4aafd24130019 Reviewed-by: Aleksandr Reviakin Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmwindow.cpp | 1 + src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp | 5 +++++ src/plugins/platforms/wasm/qwasmwindownonclientarea.h | 1 + 3 files changed, 7 insertions(+) diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp index 06d9108866..1fff58c403 100644 --- a/src/plugins/platforms/wasm/qwasmwindow.cpp +++ b/src/plugins/platforms/wasm/qwasmwindow.cpp @@ -364,6 +364,7 @@ void QWasmWindow::setWindowFlags(Qt::WindowFlags flags) flags.testFlag(Qt::WindowTransparentForInput)); m_nonClientArea->titleBar()->setMaximizeVisible(hasMaximizeButton()); + m_nonClientArea->titleBar()->setCloseVisible(m_flags.testFlag(Qt::WindowCloseButtonHint)); } void QWasmWindow::setWindowState(Qt::WindowStates newState) diff --git a/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp b/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp index 304f678add..8650f7a0c9 100644 --- a/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp +++ b/src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp @@ -349,6 +349,11 @@ void TitleBar::setMaximizeVisible(bool visible) m_maximize->setVisible(visible); } +void TitleBar::setCloseVisible(bool visible) +{ + m_close->setVisible(visible); +} + void TitleBar::setIcon(std::string_view imageData, std::string_view format) { m_icon->setImage(imageData, format); diff --git a/src/plugins/platforms/wasm/qwasmwindownonclientarea.h b/src/plugins/platforms/wasm/qwasmwindownonclientarea.h index 18d1c63f4b..8683fc7e6c 100644 --- a/src/plugins/platforms/wasm/qwasmwindownonclientarea.h +++ b/src/plugins/platforms/wasm/qwasmwindownonclientarea.h @@ -176,6 +176,7 @@ public: void setTitle(const QString &title); void setRestoreVisible(bool visible); void setMaximizeVisible(bool visible); + void setCloseVisible(bool visible); void setIcon(std::string_view imageData, std::string_view format); void setWidth(int width);