Merge branch 'bugfix-418' into testing_0.37.2

foldynl · Jul 23, 2024 · 8d0f497 · 8d0f497
2 parents fdfb43b + ff9449a
commit 8d0f497
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/ui/MainWindow.cpp b/ui/MainWindow.cpp
@@ -572,22 +572,28 @@ void MainWindow::setLayoutGeometry()
          || layoutProfile.mainState != QByteArray() )
     {
         restoreGeometry(layoutProfile.mainGeometry);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 3, 0))
+        // workaround for QTBUG-46620
         if ( isMaximized() )
         {
             const QList<QScreen *> &screens = QGuiApplication::screens();
             setGeometry( screens[0]->availableGeometry() );
         }
+#endif
         restoreState(layoutProfile.mainState);
         darkLightModeSwith->setChecked(layoutProfile.darkMode);
     }
     else
     {
         restoreGeometry(settings.value("geometry").toByteArray());
+#if (QT_VERSION < QT_VERSION_CHECK(6, 3, 0))
+        // workaround for QTBUG-46620
         if ( isMaximized() )
         {
             const QList<QScreen *> &screens = QGuiApplication::screens();
             setGeometry( screens[0]->availableGeometry() );
         }
+#endif
         restoreState(settings.value("windowState").toByteArray());
         // leave dark mode as is
     }
@@ -705,11 +711,14 @@ void MainWindow::setupLayoutMenu()
                  || layoutProfile.mainState != QByteArray() )
             {
                 restoreGeometry(layoutProfile.mainGeometry);
+#if (QT_VERSION < QT_VERSION_CHECK(6, 3, 0))
+                // workaround for QTBUG-46620
                 if ( isMaximized() )
                 {
                     const QList<QScreen *> &screens = QGuiApplication::screens();
                     setGeometry( screens[0]->availableGeometry() );
                 }
+#endif
                 restoreState(layoutProfile.mainState);
                 darkLightModeSwith->setChecked(isFusionStyle && layoutProfile.darkMode);
             }