From af4f7fe471c21836df4441079ef0fac082542b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 30 Aug 2022 14:15:08 +0200 Subject: Add QWindowsApplication::setHasBorderInFullScreenDefault() native interface Allows setting a default for whether the window should have WS_BORDER when in the full screen window state. Task-number: QTBUG-104511 Change-Id: Icbda2faf775bf1973a58f7308637c780d3c4bcd4 Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qguiapplication_p.h | 2 ++ src/plugins/platforms/windows/qwindowsapplication.cpp | 6 ++++++ src/plugins/platforms/windows/qwindowsapplication.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 72a3fc78d0..3b30c14dbe 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -364,6 +364,8 @@ struct Q_GUI_EXPORT QWindowsApplication virtual WindowActivationBehavior windowActivationBehavior() const = 0; virtual void setWindowActivationBehavior(WindowActivationBehavior behavior) = 0; + virtual void setHasBorderInFullScreenDefault(bool border) = 0; + virtual bool isTabletMode() const = 0; virtual bool isWinTabEnabled() const = 0; diff --git a/src/plugins/platforms/windows/qwindowsapplication.cpp b/src/plugins/platforms/windows/qwindowsapplication.cpp index ce52cc817e..fb344b96b2 100644 --- a/src/plugins/platforms/windows/qwindowsapplication.cpp +++ b/src/plugins/platforms/windows/qwindowsapplication.cpp @@ -7,6 +7,7 @@ #include "qwindowsmime.h" #include "qwin10helpers.h" #include "qwindowsopengltester.h" +#include "qwindowswindow.h" #include @@ -36,6 +37,11 @@ void QWindowsApplication::setWindowActivationBehavior(WindowActivationBehavior b m_windowActivationBehavior = behavior; } +void QWindowsApplication::setHasBorderInFullScreenDefault(bool border) +{ + QWindowsWindow::setHasBorderInFullScreenDefault(border); +} + bool QWindowsApplication::isTabletMode() const { #if QT_CONFIG(clipboard) diff --git a/src/plugins/platforms/windows/qwindowsapplication.h b/src/plugins/platforms/windows/qwindowsapplication.h index fc6d8b5b76..167db0d46b 100644 --- a/src/plugins/platforms/windows/qwindowsapplication.h +++ b/src/plugins/platforms/windows/qwindowsapplication.h @@ -17,6 +17,8 @@ public: WindowActivationBehavior windowActivationBehavior() const override; void setWindowActivationBehavior(WindowActivationBehavior behavior) override; + void setHasBorderInFullScreenDefault(bool border) override; + bool isTabletMode() const override; bool isWinTabEnabled() const override; -- cgit v1.2.3