# HG changeset patch
# User Torsten Lilge <ttl-octave@mailbox.org>
# Date 1606062429 -3600
# Node ID 5f535fe782b31de5f530479096a4d711a1b7b18e
# Parent  909d68d27892aef89ca7e88bfbf0186838ad66a5
fix restoring dock widgets geometry whe using Qt 5.15 (bug #59426)

* main-window.cc (set_window_layout): restore state and geometry of the main
  also after all widgets were added

diff -r 909d68d27892 -r 5f535fe782b3 libgui/src/main-window.cc
--- a/libgui/src/main-window.cc	Sun Nov 22 16:49:30 2020 +0100
+++ b/libgui/src/main-window.cc	Sun Nov 22 17:27:09 2020 +0100
@@ -1541,8 +1541,19 @@
           }
       }
 
-    if (! settings)
+    if (settings)
       {
+        // Restore main window state and geometry after creating all
+        // dock widgets
+        if (! restoreState (settings->value (mw_state).toByteArray ()))
+          restoreState (mw_state.def.toByteArray ());
+
+        if (! restoreGeometry (settings->value (mw_geometry).toByteArray ()))
+          restoreGeometry (mw_geometry.def.toByteArray ());
+      }
+    else
+      {
+        // Reset to the initial window layout and size
         restoreGeometry (mw_geometry.def.toByteArray ());
         restoreState (mw_state.def.toByteArray ());