aiden
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Qt: Fix maximized state not saving to config

Browse Source 
Restores the "old" position when restoring again. Except on Wayland,
where nothing works.
pull/3498/head
Stenzek 3 months ago
parent 3768940fbb
commit a9ce005a20
No known key found for this signature in database
2 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File

76
src/duckstation-qt/qtutils.cpp
Unescape Escape View File

@ -50,7 +50,9 @@ namespace QtUtils {
bool TryMigrateWindowGeometry(SettingsInterface* si, std::string_view window_name, QWidget* widget);
}
static constexpr const char* WINDOW_GEOMETRY_CONFIG_SECTION = "UI";
} // namespace QtUtils
QFrame* QtUtils::CreateHorizontalLine(QWidget* parent)
{
@ -431,10 +433,17 @@ std::optional<WindowInfo> QtUtils::GetWindowInfoForWidget(QWidget* widget, Rende
return wi;
}
bool QtUtils::SaveWindowGeometry(std::string_view window_name, QWidget* widget, bool auto_commit_changes)
void QtUtils::SaveWindowGeometry(std::string_view window_name, QWidget* widget, bool auto_commit_changes)
{
const QRect geometry = widget->geometry();
// don't touch minimized/fullscreen windows
if (widget->windowState() & (Qt::WindowMinimized | Qt::WindowFullScreen))
return;
// save the unmaximized geometry if maximized
const bool maximized = (widget->windowState() & Qt::WindowMaximized);
const QRect geometry = maximized ? widget->normalGeometry() : widget->geometry();
const TinyString maxkey = TinyString::from_format("{}Maximized", window_name);
const TinyString xkey = TinyString::from_format("{}X", window_name);
const TinyString ykey = TinyString::from_format("{}Y", window_name);
const TinyString wkey = TinyString::from_format("{}Width", window_name);
@ -442,35 +451,44 @@ bool QtUtils::SaveWindowGeometry(std::string_view window_name, QWidget* widget,
const auto lock = Host::GetSettingsLock();
SettingsInterface* si = Host::Internal::GetBaseSettingsLayer();
bool changed = false;
if (si->GetIntValue("UI", xkey.c_str(), std::numeric_limits<s32>::min()) != geometry.x())
if (si->GetBoolValue(WINDOW_GEOMETRY_CONFIG_SECTION, maxkey.c_str(), false) != maximized)
{
si->SetIntValue("UI", xkey.c_str(), geometry.x());
si->SetBoolValue(WINDOW_GEOMETRY_CONFIG_SECTION, maxkey.c_str(), maximized);
changed = true;
}
if (si->GetIntValue("UI", ykey.c_str(), std::numeric_limits<s32>::min()) != geometry.y())
if (si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, xkey.c_str(), std::numeric_limits<s32>::min()) != geometry.x())
{
si->SetIntValue("UI", ykey.c_str(), geometry.y());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, xkey.c_str(), geometry.x());
changed = true;
}
if (si->GetIntValue("UI", wkey.c_str(), std::numeric_limits<s32>::min()) != geometry.width())
if (si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, ykey.c_str(), std::numeric_limits<s32>::min()) != geometry.y())
{
si->SetIntValue("UI", wkey.c_str(), geometry.width());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, ykey.c_str(), geometry.y());
changed = true;
}
if (si->GetIntValue("UI", hkey.c_str(), std::numeric_limits<s32>::min()) != geometry.height())
// only save position if maxi
if (si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, wkey.c_str(), std::numeric_limits<s32>::min()) !=
geometry.width())
{
si->SetIntValue("UI", hkey.c_str(), geometry.height());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, wkey.c_str(), geometry.width());
changed = true;
}
if (si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, hkey.c_str(), std::numeric_limits<s32>::min()) !=
geometry.height())
{
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, hkey.c_str(), geometry.height());
changed = true;
}
if (changed && auto_commit_changes)
Host::CommitBaseSettingChanges();
return true;
}
bool QtUtils::RestoreWindowGeometry(std::string_view window_name, QWidget* widget)
@ -479,15 +497,20 @@ bool QtUtils::RestoreWindowGeometry(std::string_view window_name, QWidget* widge
SettingsInterface* si = Host::Internal::GetBaseSettingsLayer();
s32 x = 0, y = 0, w = 0, h = 0;
if (!si->GetIntValue("UI", TinyString::from_format("{}X", window_name).c_str(), &x) ||
!si->GetIntValue("UI", TinyString::from_format("{}Y", window_name).c_str(), &y) ||
!si->GetIntValue("UI", TinyString::from_format("{}Width", window_name).c_str(), &w) ||
!si->GetIntValue("UI", TinyString::from_format("{}Height", window_name).c_str(), &h))
const bool maximized = si->GetBoolValue(WINDOW_GEOMETRY_CONFIG_SECTION,
TinyString::from_format("{}Maximized", window_name).c_str(), false);
if (!si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}X", window_name).c_str(), &x) ||
!si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Y", window_name).c_str(), &y) ||
!si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Width", window_name).c_str(), &w) ||
!si->GetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Height", window_name).c_str(), &h))
{
return TryMigrateWindowGeometry(si, window_name, widget);
}
widget->setGeometry(x, y, w, h);
if (maximized)
widget->setWindowState(widget->windowState() | Qt::WindowMaximized);
return true;
}
@ -496,7 +519,7 @@ bool QtUtils::TryMigrateWindowGeometry(SettingsInterface* si, std::string_view w
// can we migrate old configuration?
const TinyString config_key = TinyString::from_format("{}Geometry", window_name);
std::string config_value;
if (!si->GetStringValue("UI", config_key.c_str(), &config_value))
if (!si->GetStringValue(WINDOW_GEOMETRY_CONFIG_SECTION, config_key.c_str(), &config_value))
return false;
widget->restoreGeometry(QByteArray::fromBase64(QByteArray::fromStdString(config_value)));
@ -505,12 +528,17 @@ bool QtUtils::TryMigrateWindowGeometry(SettingsInterface* si, std::string_view w
widget->setWindowState(widget->windowState() & ~(Qt::WindowFullScreen | Qt::WindowActive));
// save the new values, delete the old key
const QRect geometry = widget->geometry();
si->SetIntValue("UI", TinyString::from_format("{}X", window_name).c_str(), geometry.x());
si->SetIntValue("UI", TinyString::from_format("{}Y", window_name).c_str(), geometry.y());
si->SetIntValue("UI", TinyString::from_format("{}Width", window_name).c_str(), geometry.width());
si->SetIntValue("UI", TinyString::from_format("{}Height", window_name).c_str(), geometry.height());
si->DeleteValue("UI", config_key.c_str());
const bool maximized = (widget->windowState() & Qt::WindowMaximized);
const QRect geometry = maximized ? widget->normalGeometry() : widget->geometry();
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}X", window_name).c_str(), geometry.x());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Y", window_name).c_str(), geometry.y());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Width", window_name).c_str(),
geometry.width());
si->SetIntValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Height", window_name).c_str(),
geometry.height());
si->SetBoolValue(WINDOW_GEOMETRY_CONFIG_SECTION, TinyString::from_format("{}Maximized", window_name).c_str(),
maximized);
si->DeleteValue(WINDOW_GEOMETRY_CONFIG_SECTION, config_key.c_str());
Host::CommitBaseSettingChanges();
return true;
}

2
src/duckstation-qt/qtutils.h
Unescape Escape View File

@ -122,7 +122,7 @@ qreal GetDevicePixelRatioForWidget(const QWidget* widget);
std::optional<WindowInfo> GetWindowInfoForWidget(QWidget* widget, RenderAPI render_api, Error* error = nullptr);
/// Saves a window's geometry to configuration. Returns false if the configuration was changed.
bool SaveWindowGeometry(std::string_view window_name, QWidget* widget, bool auto_commit_changes = true);
void SaveWindowGeometry(std::string_view window_name, QWidget* widget, bool auto_commit_changes = true);
/// Restores a window's geometry from configuration. Returns false if it was not found in the configuration.
bool RestoreWindowGeometry(std::string_view window_name, QWidget* widget);

Write Preview
Loading…
Cancel
Save