Merge pull request The-OpenROAD-Project#7967 from The-OpenROAD-Project-staging/gui-window-size

gui: delay geometry update to showEvent

Author: maliberty

src/gui/src/mainWindow.cpp

@@ -92,16 +92,6 @@ MainWindow::MainWindow(bool load_settings, QWidget* parent)
       find_dialog_(new FindObjectDialog(this)),
       goto_dialog_(new GotoLocationDialog(this, viewers_))
 {
-  // Size and position the window
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  QSize size = screen()->availableGeometry().size();
-#else
-  QSize size = QDesktopWidget().availableGeometry(this).size();
-#endif
-
-  resize(size * 0.8);
-  move(size.width() * 0.1, size.height() * 0.1);
-
   QFont font("Monospace");
   font.setStyleHint(QFont::Monospace);
   script_->setWidgetFont(font);
@@ -399,8 +389,10 @@ MainWindow::MainWindow(bool load_settings, QWidget* parent)
     // Restore the settings (if none this is a no-op)
     QSettings settings("OpenRoad Project", "openroad");
     settings.beginGroup("main");
-    restoreGeometry(settings.value("geometry").toByteArray());
-    restoreState(settings.value("state").toByteArray());
+    // Save these for the showEvent as the window manager may not respect them
+    // if restore here.
+    saved_geometry_ = settings.value("geometry").toByteArray();
+    saved_state_ = settings.value("state").toByteArray();
     QApplication::setFont(
         settings.value("font", QApplication::font()).value<QFont>());
     hide_option_->setChecked(
@@ -438,6 +430,31 @@ MainWindow::MainWindow(bool load_settings, QWidget* parent)
   };
 }
 
+void MainWindow::showEvent(QShowEvent* event)
+{
+  QWidget::showEvent(event);
+
+  if (!first_show_) {
+    return;
+  }
+
+  if (saved_geometry_.has_value() && saved_state_.has_value()) {
+    restoreGeometry(saved_geometry_.value());
+    restoreState(saved_state_.value());
+  } else {
+    // Default size and position the window
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    QSize size = screen()->availableGeometry().size();
+#else
+    QSize size = QDesktopWidget().availableGeometry(this).size();
+#endif
+
+    resize(size * 0.8);
+    move(size.width() * 0.1, size.height() * 0.1);
+  }
+  first_show_ = false;
+}
+
 MainWindow::~MainWindow()
 {
   auto* gui = Gui::get();
@@ -1862,4 +1879,4 @@ void MainWindow::reportSlackHistogramPaths(
 
   timing_widget_->reportSlackHistogramPaths(report_pins, path_group_name);
 }
-}  // namespace gui
+}  // namespace gui

src/gui/src/mainWindow.h

@@ -276,6 +276,7 @@ class MainWindow : public QMainWindow, public odb::dbDatabaseObserver
   // used to check if user intends to close Openroad or just the GUI.
   void closeEvent(QCloseEvent* event) override;
   void keyPressEvent(QKeyEvent* event) override;
+  void showEvent(QShowEvent* event) override;
 
  private slots:
   void setBlock(odb::dbBlock* block);
@@ -307,6 +308,10 @@ class MainWindow : public QMainWindow, public odb::dbDatabaseObserver
 
   int arrow_keys_scroll_step_;
 
+  bool first_show_{true};
+  std::optional<QByteArray> saved_geometry_;
+  std::optional<QByteArray> saved_state_;
+
   // All but viewer_ are owned by this widget.  Qt will
   // handle destroying the children.
   DisplayControls* controls_;