archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Qt: simplify resetGeometry occurances

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/rpcs3qt/main_window.cpp
View file

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

7
rpcs3/rpcs3qt/save_manager_dialog.cpp
View file

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

9
rpcs3/rpcs3qt/trophy_manager_dialog.cpp
View file

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