summaryrefslogtreecommitdiff
path: root/src/citra_qt
diff options
context:
space:
mode:
authorGravatar bunnei2017-08-29 11:29:10 -0400
committerGravatar GitHub2017-08-29 11:29:10 -0400
commit75cd28a7cc1c73e1be1fc72d4b86b267cbb79081 (patch)
tree18f3e7e5b864511da54d847e645dd23a69033924 /src/citra_qt
parentMerge pull request #2905 from danzel/fix-2902 (diff)
parentEmuWindow: refactor touch input into a TouchDevice (diff)
downloadyuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.tar.gz
yuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.tar.xz
yuzu-75cd28a7cc1c73e1be1fc72d4b86b267cbb79081.zip
Merge pull request #2899 from wwylele/touch-refactor
Refactor touch input into a TouchDevice
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/configuration/config.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp
index e2dceaa4c..ef114aad3 100644
--- a/src/citra_qt/configuration/config.cpp
+++ b/src/citra_qt/configuration/config.cpp
@@ -61,6 +61,8 @@ void Config::ReadValues() {
61 qt_config->value("motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01") 61 qt_config->value("motion_device", "engine:motion_emu,update_period:100,sensitivity:0.01")
62 .toString() 62 .toString()
63 .toStdString(); 63 .toStdString();
64 Settings::values.touch_device =
65 qt_config->value("touch_device", "engine:emu_window").toString().toStdString();
64 66
65 qt_config->endGroup(); 67 qt_config->endGroup();
66 68
@@ -213,6 +215,7 @@ void Config::SaveValues() {
213 QString::fromStdString(Settings::values.analogs[i])); 215 QString::fromStdString(Settings::values.analogs[i]));
214 } 216 }
215 qt_config->setValue("motion_device", QString::fromStdString(Settings::values.motion_device)); 217 qt_config->setValue("motion_device", QString::fromStdString(Settings::values.motion_device));
218 qt_config->setValue("touch_device", QString::fromStdString(Settings::values.touch_device));
216 qt_config->endGroup(); 219 qt_config->endGroup();
217 220
218 qt_config->beginGroup("Core"); 221 qt_config->beginGroup("Core");