Merge branch 'master' into HanaGemela-patch-2

CHANGELOG.md

@@ -10,6 +10,7 @@ Summary
 
 * Bugfix - Crash when accepting a notification: [#11226](https://github.com/owncloud/client/issues/11226)
 * Change - Remove unused command line option --language: [#11245](https://github.com/owncloud/client/issues/11245)
+* Change - Windows: always use fusion style: [#11275](https://github.com/owncloud/client/issues/11275)
 
 Details
 -------
@@ -28,6 +29,14 @@ Details
    https://github.com/owncloud/client/issues/11245
    https://github.com/owncloud/client/pull/11270
 
+* Change - Windows: always use fusion style: [#11275](https://github.com/owncloud/client/issues/11275)
+
+   We already used the fusion style on Windows for years if the system used dpi scaling. Since Qt6.5
+   the fusion style also support the dark theme on Windows. Those two reasons convinced us that
+   always using the fusion style on Windows will result in the best experience for the users.
+
+   https://github.com/owncloud/client/issues/11275
+
 Changelog for ownCloud Desktop Client [5.0.0] (2023-10-05)
 =======================================
 The following sections list the changes in ownCloud Desktop Client 5.0.0 relevant to

changelog/unreleased/11275

@@ -0,0 +1,8 @@
+Change: Windows: always use fusion style
+
+We already used the fusion style on Windows for years if the system used dpi scaling.
+Since Qt6.5 the fusion style also support the dark theme on Windows.
+Those two reasons convinced us that always using the fusion style on Windows will result
+in the best experience for the users.
+
+https://github.com/owncloud/client/issues/11275

src/crashreporter/main.cpp

@@ -27,14 +27,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
 #ifdef Q_OS_WIN
-    // The Windows style still has pixelated elements with Qt 5.6,
-    // it's recommended to use the Fusion style in this case, even
-    // though it looks slightly less native. Check here after the
-    // QApplication was constructed, but before any QWidget is
-    // constructed.
-    if (!qFuzzyCompare(app.devicePixelRatio(), 1)) {
-        QApplication::setStyle(QStringLiteral("fusion"));
-    }
+    QApplication::setStyle(QStringLiteral("fusion"));
 #endif // Q_OS_WIN
 
     if (app.arguments().size() != 2) {

src/libsync/platform_win.cpp

@@ -65,15 +65,8 @@ void WinPlatform::setApplication(QCoreApplication *application)
     const QString opensslConf = QCoreApplication::applicationDirPath() + QStringLiteral("/openssl.cnf");
     qputenv("OPENSSL_CONF", opensslConf.toLocal8Bit());
 
-    // The Windows style still has pixelated elements with Qt 5.6,
-    // it's recommended to use the Fusion style in this case, even
-    // though it looks slightly less native. Check here after the
-    // QApplication was constructed, but before any QWidget is
-    // constructed.
     if (auto guiApp = qobject_cast<QGuiApplication *>(application)) {
-        if (!qFuzzyCompare(guiApp->devicePixelRatio(), 1)) {
-            QApplication::setStyle(QStringLiteral("fusion"));
-        }
+        QApplication::setStyle(QStringLiteral("fusion"));
     }
 }