Qt: simplify resetGeometry occurances

This commit is contained in:
Megamouse 2018-03-28 20:08:15 +02:00 committed by Ivan
parent 755ceb50a4
commit 92ec846375
3 changed files with 6 additions and 22 deletions

View file

@ -1374,17 +1374,11 @@ void main_window::CreateDockWindows()
void main_window::ConfigureGuiFromSettings(bool configure_all)
{
// Restore GUI state if needed. We need to if they exist.
QByteArray geometry = guiSettings->GetValue(gui::mw_geometry).toByteArray();
if (geometry.isEmpty() == false)
if (!restoreGeometry(guiSettings->GetValue(gui::mw_geometry).toByteArray()))
{
restoreGeometry(geometry);
}
else
{ // By default, set the window to 70% of the screen and the debugger frame is hidden.
// By default, set the window to 70% of the screen and the debugger frame is hidden.
m_debuggerFrame->hide();
QSize defaultSize = QDesktopWidget().availableGeometry().size() * 0.7;
resize(defaultSize);
resize(QDesktopWidget().availableGeometry().size() * 0.7);
}
restoreState(guiSettings->GetValue(gui::mw_windowState).toByteArray());

View file

@ -122,11 +122,8 @@ void save_manager_dialog::Init(std::string dir)
UpdateList();
QByteArray geometry = m_gui_settings->GetValue(gui::sd_geometry).toByteArray();
if (geometry.isEmpty() == false)
{
restoreGeometry(geometry);
}
if (restoreGeometry(m_gui_settings->GetValue(gui::sd_geometry).toByteArray()))
resize(size().expandedTo(QDesktopWidget().availableGeometry().size() * 0.5));
// Connects and events
connect(push_close, &QAbstractButton::clicked, this, &save_manager_dialog::close);

View file

@ -151,15 +151,8 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr<gui_settings> gui_s
all_layout->setStretch(1, 1);
setLayout(all_layout);
QByteArray geometry = m_gui_settings->GetValue(gui::tr_geometry).toByteArray();
if (geometry.isEmpty() == false)
{
restoreGeometry(geometry);
}
else
{
if (!restoreGeometry(m_gui_settings->GetValue(gui::tr_geometry).toByteArray()))
resize(QDesktopWidget().availableGeometry().size() * 0.7);
}
// Make connects
connect(m_icon_slider, &QSlider::valueChanged, this, [=](int val)