summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Ameer J2021-09-28 17:07:12 -0400
committerGravatar GitHub2021-09-28 17:07:12 -0400
commitfba301155bcc99b58e54450cd3be359d7e535a2b (patch)
treedebc9b9d13ec4d0930616865e9823f91e833e9d8 /src
parentMerge pull request #7076 from ameerj/amd-botw (diff)
parentIf not on Windows, disable raw input (diff)
downloadyuzu-fba301155bcc99b58e54450cd3be359d7e535a2b.tar.gz
yuzu-fba301155bcc99b58e54450cd3be359d7e535a2b.tar.xz
yuzu-fba301155bcc99b58e54450cd3be359d7e535a2b.zip
Merge pull request #7042 from v1993/patch-7
Hide XInput bypass on non-Windows OSes
Diffstat (limited to 'src')
-rw-r--r--src/yuzu/configuration/config.cpp4
-rw-r--r--src/yuzu/configuration/configure_input_advanced.cpp4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 27b67fd9e..b5796a8fc 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -562,7 +562,11 @@ void Config::ReadControlValues() {
562 ReadTouchscreenValues(); 562 ReadTouchscreenValues();
563 ReadMotionTouchValues(); 563 ReadMotionTouchValues();
564 564
565#ifdef _WIN32
565 ReadBasicSetting(Settings::values.enable_raw_input); 566 ReadBasicSetting(Settings::values.enable_raw_input);
567#else
568 Settings::values.enable_raw_input = false;
569#endif
566 ReadBasicSetting(Settings::values.emulate_analog_keyboard); 570 ReadBasicSetting(Settings::values.emulate_analog_keyboard);
567 Settings::values.mouse_panning = false; 571 Settings::values.mouse_panning = false;
568 ReadBasicSetting(Settings::values.mouse_panning_sensitivity); 572 ReadBasicSetting(Settings::values.mouse_panning_sensitivity);
diff --git a/src/yuzu/configuration/configure_input_advanced.cpp b/src/yuzu/configuration/configure_input_advanced.cpp
index d20fd86b6..b30f09013 100644
--- a/src/yuzu/configuration/configure_input_advanced.cpp
+++ b/src/yuzu/configuration/configure_input_advanced.cpp
@@ -88,6 +88,10 @@ ConfigureInputAdvanced::ConfigureInputAdvanced(QWidget* parent)
88 connect(ui->buttonMotionTouch, &QPushButton::clicked, this, 88 connect(ui->buttonMotionTouch, &QPushButton::clicked, this,
89 &ConfigureInputAdvanced::CallMotionTouchConfigDialog); 89 &ConfigureInputAdvanced::CallMotionTouchConfigDialog);
90 90
91#ifndef _WIN32
92 ui->enable_raw_input->setVisible(false);
93#endif
94
91 LoadConfiguration(); 95 LoadConfiguration();
92} 96}
93 97