Mirrors/citra-nightly
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

citra-qt: Add back missing hotkeys & conflict fixes.

Browse source 
* Also fixed a missing spacer in ConfigureGeneral.
This commit is contained in:
Adityarup Laha 2018-11-17 16:55:05 +05:30
parent 4309585623
commit 988acf588a
No known key found for this signature in database
GPG key ID: 1B24048A1F78845F
5 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/citra_qt/configuration/configure_dialog.cpp
View file

@ -10,8 +10,8 @@
#include "core/settings.h"
#include "ui_configure.h"
ConfigureDialog::ConfigureDialog(QWidget* parent, const HotkeyRegistry& registry)
: QDialog(parent), ui(new Ui::ConfigureDialog) {
ConfigureDialog::ConfigureDialog(QWidget* parent, HotkeyRegistry& registry)
: QDialog(parent), registry(registry), ui(new Ui::ConfigureDialog) {
ui->setupUi(this);
ui->hotkeysTab->Populate(registry);
@ -47,7 +47,7 @@ void ConfigureDialog::setConfiguration() {
ui->uiTab->setConfiguration();
}
void ConfigureDialog::applyConfiguration(HotkeyRegistry& registry) {
void ConfigureDialog::applyConfiguration() {
ui->generalTab->applyConfiguration();
ui->systemTab->applyConfiguration();
ui->inputTab->applyConfiguration();