summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikolaj Boc <[email protected]>2023-02-02 08:59:26 +0100
committerMikolaj Boc <[email protected]>2023-03-27 19:11:40 +0100
commit290c5d0e02f5cd1f321d926c2fdb0ae4d2e807d9 (patch)
treedf5f61a6c96f7af0db21f5ecbd5e75ea9b65d7b3
parentffa61cbeddf43962e98cf55a47e8653744c0b9ef (diff)
Support Qt::WindowCloseButtonHint in QWasmWindow
Change-Id: I1cd74e5c9e73c2585d3da3fa0ee4aafd24130019 Reviewed-by: Aleksandr Reviakin <[email protected]> Reviewed-by: Morten Johan Sørvig <[email protected]> (cherry picked from commit f9bf0be85467f9691dfc03402000630832312443) Reviewed-by: Mikołaj Boc <[email protected]>
-rw-r--r--src/plugins/platforms/wasm/qwasmwindow.cpp1
-rw-r--r--src/plugins/platforms/wasm/qwasmwindownonclientarea.cpp5
-rw-r--r--src/plugins/platforms/wasm/qwasmwindownonclientarea.h1
3 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/wasm/qwasmwindow.cpp b/src/plugins/platforms/wasm/qwasmwindow.cpp
index 04ee9fa3c7c..3f58be62e26 100644
--- a/src/plugins/platforms/wasm/qwasmwindow.cpp
+++ b/src/plugins/platforms/wasm/qwasmwindow.cpp
@@ -365,6 +365,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 304f678add4..8650f7a0c9e 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 18d1c63f4b3..8683fc7e6c8 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);