kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1117 from kiwix/qt_6.7

Browse Source 
Do not use removed `setHasBorderInFullScreen` with qt >= 6.0
This commit is contained in:
Kelson 2024-05-27 15:57:39 +02:00 committed by GitHub
commit e3745f0113
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/kiwixapp.cpp
View File

@ -15,7 +15,7 @@
#include <QPrintDialog> #include <QPrintDialog>
#include <thread> #include <thread>
#include <QMessageBox> #include <QMessageBox>
#ifdef Q_OS_WIN #if defined(Q_OS_WIN) && QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
#include <QtPlatformHeaders\QWindowsWindowFunctions> #include <QtPlatformHeaders\QWindowsWindowFunctions>
#endif #endif
@ -96,7 +96,12 @@ void KiwixApp::init()
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QWindow *window = mp_mainWindow->windowHandle(); QWindow *window = mp_mainWindow->windowHandle();
if (window) { if (window) {
QWindowsWindowFunctions::setHasBorderInFullScreen(window, true); #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
} }
#endif #endif
connect(this, &QtSingleApplication::messageReceived, this, [=](const QString &message) { connect(this, &QtSingleApplication::messageReceived, this, [=](const QString &message) {