Mercurial > octave

comparison libgui/src/main-window.cc @ 29096:c5ccb3d2be81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 24 Nov 2020 20:34:02 -0500
parents f61d1faacfca f8c6660f2ccc
children 0d8e5f890a9b
comparison
equal deleted inserted replaced
29094:d09dde091073 29096:c5ccb3d2be81
1594 widget->setVisible (visible); // not floating -> show 1594 widget->setVisible (visible); // not floating -> show
1595 } 1595 }
1596 } 1596 }
1597 } 1597 }
1598 1598
1599 if (settings) 1599 if (! settings)
1600 { 1600 {
1601 // Restore main window state and geometry after creating all
1602 // dock widgets
1603 if (! restoreState (settings->value (mw_state).toByteArray ()))
1604 restoreState (mw_state.def.toByteArray ());
1605
1606 if (! restoreGeometry (settings->value (mw_geometry).toByteArray ()))
1607 restoreGeometry (mw_geometry.def.toByteArray ());
1608 }
1609 else
1610 {
1611 // Reset to the initial window layout and size
1612 restoreGeometry (mw_geometry.def.toByteArray ()); 1601 restoreGeometry (mw_geometry.def.toByteArray ());
1613 restoreState (mw_state.def.toByteArray ()); 1602 restoreState (mw_state.def.toByteArray ());
1614 1603
1615 QDesktopWidget *m_desktop = QApplication::desktop (); 1604 QDesktopWidget *m_desktop = QApplication::desktop ();
1616 QRect screen_geo = m_desktop->availableGeometry (this); 1605 QRect screen_geo = m_desktop->availableGeometry (this);