drifty/emulator
1
0
Fork 0
mirror of https://git.citron-emu.org/citron/emulator synced 2025-12-19 10:43:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix/hotkey-memory

Browse Source 
Signed-off-by: Collecting <collecting@noreply.localhost>
This commit is contained in:
Collecting
2025-11-01 21:02:55 +00:00
parent 45cfbbeb6b
commit 0d5506030b
1 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/citron/configuration/qt_config.cpp
View File

@@ -240,24 +240,21 @@ void QtConfig::ReadPathValues() {
void QtConfig::ReadShortcutValues() { void QtConfig::ReadShortcutValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::Shortcuts)); BeginGroup(Settings::TranslateCategory(Settings::Category::Shortcuts));
for (const auto& [name, group, shortcut] : UISettings::default_hotkeys) { UISettings::values.shortcuts.clear();
BeginGroup(group); const int shortcuts_size = BeginArray(std::string("shortcuts"));
BeginGroup(name); for (int i = 0; i < shortcuts_size; ++i) {
SetArrayIndex(i);
const std::string name = ReadStringSetting(std::string("name"));
const std::string group = ReadStringSetting(std::string("group"));
const std::string keyseq = ReadStringSetting(std::string("keyseq"));
const std::string controller_keyseq = ReadStringSetting(std::string("controller_keyseq"));
const int context = ReadIntegerSetting(std::string("context"), Qt::WindowShortcut);
const bool repeat = ReadBooleanSetting(std::string("repeat"), false);
// No longer using ReadSetting for shortcut.second as it inaccurately returns a value of 1
// for WidgetWithChildrenShortcut which is a value of 3. Needed to fix shortcuts the open
// a file dialog in windowed mode
UISettings::values.shortcuts.push_back( UISettings::values.shortcuts.push_back(
{name, {name, group, {keyseq, controller_keyseq, context, repeat}});
group,
{ReadStringSetting(std::string("KeySeq"), shortcut.keyseq),
ReadStringSetting(std::string("Controller_KeySeq"), shortcut.controller_keyseq),
shortcut.context,
ReadBooleanSetting(std::string("Repeat"), std::optional(shortcut.repeat))}});
EndGroup(); // name
EndGroup(); // group
} }
EndArray();
EndGroup(); EndGroup();
} }
@@ -445,27 +442,18 @@ void QtConfig::SavePathValues() {
void QtConfig::SaveShortcutValues() { void QtConfig::SaveShortcutValues() {
BeginGroup(Settings::TranslateCategory(Settings::Category::Shortcuts)); BeginGroup(Settings::TranslateCategory(Settings::Category::Shortcuts));
// Lengths of UISettings::values.shortcuts & default_hotkeys are same. BeginArray(std::string("shortcuts"));
// However, their ordering must also be the same. for (std::size_t i = 0; i < UISettings::values.shortcuts.size(); ++i) {
for (std::size_t i = 0; i < UISettings::default_hotkeys.size(); i++) { SetArrayIndex(static_cast<int>(i)); // SetArrayIndex expects an int, so we cast here.
const auto& [name, group, shortcut] = UISettings::values.shortcuts[i]; const auto& shortcut = UISettings::values.shortcuts[i];
const auto& default_hotkey = UISettings::default_hotkeys[i].shortcut; WriteStringSetting(std::string("name"), shortcut.name);
WriteStringSetting(std::string("group"), shortcut.group);
BeginGroup(group); WriteStringSetting(std::string("keyseq"), shortcut.shortcut.keyseq);
BeginGroup(name); WriteStringSetting(std::string("controller_keyseq"), shortcut.shortcut.controller_keyseq);
WriteIntegerSetting(std::string("context"), shortcut.shortcut.context);
WriteStringSetting(std::string("KeySeq"), shortcut.keyseq, WriteBooleanSetting(std::string("repeat"), shortcut.shortcut.repeat);
std::make_optional(default_hotkey.keyseq));
WriteStringSetting(std::string("Controller_KeySeq"), shortcut.controller_keyseq,
std::make_optional(default_hotkey.controller_keyseq));
WriteIntegerSetting(std::string("Context"), shortcut.context,
std::make_optional(default_hotkey.context));
WriteBooleanSetting(std::string("Repeat"), shortcut.repeat,
std::make_optional(default_hotkey.repeat));
EndGroup(); // name
EndGroup(); // group
} }
EndArray();
EndGroup(); EndGroup();
} }