Merge pull request #1019 from shenlebantongying/temp_max_fix

fix: Qt6.4/5's maximum bug https://bugreports.qt.io/browse/QTBUG-115074
xiaoyifang · Jul 28, 2023 · 365899c · 365899c
2 parents 69905ed + 1ffd729
commit 365899c
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
@@ -741,10 +741,6 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   // Create tab list menu
   createTabList();
 
-  if ( cfg.mainWindowState.size() && !cfg.resetState )
-    restoreState( cfg.mainWindowState );
-  if ( cfg.mainWindowGeometry.size() )
-    restoreGeometry( cfg.mainWindowGeometry );
 
 #if defined( Q_OS_LINUX )
   #if ( QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 ) )
@@ -915,6 +911,12 @@ MainWindow::MainWindow( Config::Class & cfg_ ):
   urlRegistry.endGroup();
 #endif
 
+  // restore should be called after all UI initialized.
+  if ( cfg.mainWindowState.size() && !cfg.resetState )
+    restoreState( cfg.mainWindowState );
+  if ( cfg.mainWindowGeometry.size() )
+    restoreGeometry( cfg.mainWindowGeometry );
+
   useSmallIconsInToolbarsTriggered();
 
   if ( cfg.preferences.checkForNewReleases ) {