WIP

kiwix · Dec 20, 2024 · 881d227 · 881d227
1 parent 0629cc4
commit 881d227
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
@@ -4,7 +4,7 @@
 #
 #-------------------------------------------------
 
-QT       += core gui network
+QT       += core gui gui-private network
 QT       += webenginewidgets webchannel
 QT       += printsupport
 qtHaveModule(texttospeech): QT += texttospeech

diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
@@ -15,8 +15,13 @@
 #include <QPrintDialog>
 #include <thread>
 #include <QMessageBox>
-#if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#if defined(Q_OS_WIN)
+#include <QWindow>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 #include <QtPlatformHeaders\QWindowsWindowFunctions>
+#else
+#include <qpa/qplatformwindow_p.h>
+#endif
 #endif
 
 const QString DEFAULT_SAVE_DIR = QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
@@ -95,12 +100,14 @@ void KiwixApp::init()
 #ifdef Q_OS_WIN
     QWindow *window = mp_mainWindow->windowHandle();
     if (window) {
-        #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-            QWindowsWindowFunctions::setHasBorderInFullScreen(window, true);
-        #else
-            HWND handle = reinterpret_cast<HWND>(window->winId());
-            SetWindowLongPtr(handle, GWL_STYLE, GetWindowLongPtr(handle, GWL_STYLE) | WS_BORDER);
-        #endif
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+        QWindowsWindowFunctions::setHasBorderInFullScreen(window, true);
+#else
+        auto nativeWindow = dynamic_cast<QNativeInterface::Private::QWindowsWindow *>(window->nativeInterface());
+        if (nativeWindow) {
+            nativeWindow->setHasBorderInFullScreen(true);
+        }
+#endif
     }
 #endif
     connect(this, &QtSingleApplication::messageReceived, this, [=](const QString &message) {