From 92ec846375e82d91c2bbd0033ec0ca256cd8fa13 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Wed, 28 Mar 2018 20:08:15 +0200 Subject: [PATCH] Qt: simplify resetGeometry occurances --- rpcs3/rpcs3qt/main_window.cpp | 12 +++--------- rpcs3/rpcs3qt/save_manager_dialog.cpp | 7 ++----- rpcs3/rpcs3qt/trophy_manager_dialog.cpp | 9 +-------- 3 files changed, 6 insertions(+), 22 deletions(-) diff --git a/rpcs3/rpcs3qt/main_window.cpp b/rpcs3/rpcs3qt/main_window.cpp index 1665bddbc1..7e2a25bfb9 100644 --- a/rpcs3/rpcs3qt/main_window.cpp +++ b/rpcs3/rpcs3qt/main_window.cpp @@ -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()); diff --git a/rpcs3/rpcs3qt/save_manager_dialog.cpp b/rpcs3/rpcs3qt/save_manager_dialog.cpp index 812ce7c805..45af50c234 100644 --- a/rpcs3/rpcs3qt/save_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/save_manager_dialog.cpp @@ -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); diff --git a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp index 6b18290d8b..e222b317cf 100644 --- a/rpcs3/rpcs3qt/trophy_manager_dialog.cpp +++ b/rpcs3/rpcs3qt/trophy_manager_dialog.cpp @@ -151,15 +151,8 @@ trophy_manager_dialog::trophy_manager_dialog(std::shared_ptr 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)