octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

citra-qt: Fixed reloading hotkeys on-the fly.

This commit is contained in:
Adityarup Laha 2018-11-16 21:19:43 +05:30
parent 5fa25fcf13
commit 9615acb550
No known key found for this signature in database
GPG Key ID: 1B24048A1F78845F
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/citra_qt/configuration/configure_dialog.cpp
View File

@ -26,8 +26,6 @@ ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry
&ConfigureHotkeys::OnInputKeysChanged); &ConfigureHotkeys::OnInputKeysChanged);
connect(ui->hotkeysTab, &ConfigureHotkeys::HotkeysChanged, ui->inputTab, connect(ui->hotkeysTab, &ConfigureHotkeys::HotkeysChanged, ui->inputTab,
&ConfigureInput::OnHotkeysChanged); &ConfigureInput::OnHotkeysChanged);
connect(ui->hotkeysTab, &ConfigureHotkeys::HotkeysChanged, this,
[this]() { emit UpdateHotkeys(); });
// Synchronise lists upon initialisation // Synchronise lists upon initialisation
ui->inputTab->EmitInputKeysChanged(); ui->inputTab->EmitInputKeysChanged();

1
src/citra_qt/configuration/configure_dialog.h
View File

@ -29,7 +29,6 @@ private slots:
signals: signals:
void languageChanged(const QString& locale); void languageChanged(const QString& locale);
void UpdateHotkeys();
private: private:
void setConfiguration(); void setConfiguration();

3
src/citra_qt/main.cpp
View File

@ -1319,8 +1319,6 @@ void GMainWindow::OnConfigure() {
ConfigureDialog configureDialog(this, hotkey_registry); ConfigureDialog configureDialog(this, hotkey_registry);
connect(&configureDialog, &ConfigureDialog::languageChanged, this, connect(&configureDialog, &ConfigureDialog::languageChanged, this,
&GMainWindow::OnLanguageChanged); &GMainWindow::OnLanguageChanged);
connect(&configureDialog, &ConfigureDialog::UpdateHotkeys, this,
[this]() { InitializeHotkeys(); });
auto old_theme = UISettings::values.theme; auto old_theme = UISettings::values.theme;
const int old_input_profile_index = Settings::values.current_input_profile_index; const int old_input_profile_index = Settings::values.current_input_profile_index;
const auto old_input_profiles = Settings::values.input_profiles; const auto old_input_profiles = Settings::values.input_profiles;
@ -1328,6 +1326,7 @@ void GMainWindow::OnConfigure() {
auto result = configureDialog.exec(); auto result = configureDialog.exec();
if (result == QDialog::Accepted) { if (result == QDialog::Accepted) {
configureDialog.applyConfiguration(hotkey_registry); configureDialog.applyConfiguration(hotkey_registry);
InitializeHotkeys();
if (UISettings::values.theme != old_theme) if (UISettings::values.theme != old_theme)
UpdateUITheme(); UpdateUITheme();
if (UISettings::values.enable_discord_presence != old_discord_presence) if (UISettings::values.enable_discord_presence != old_discord_presence)