summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Narr the Reg2022-04-26 18:19:17 -0500
committerGravatar Narr the Reg2022-04-26 19:03:54 -0500
commitd2388a2ca82ec2e45f6459726dc79760dc06bdd2 (patch)
treefb7fd5bbda9ae834e1061cc90d84ed7553c7ce67
parentMerge pull request #8262 from Morph1984/conan (diff)
downloadyuzu-d2388a2ca82ec2e45f6459726dc79760dc06bdd2.tar.gz
yuzu-d2388a2ca82ec2e45f6459726dc79760dc06bdd2.tar.xz
yuzu-d2388a2ca82ec2e45f6459726dc79760dc06bdd2.zip
yuzu: config: Set default range to 95%
-rw-r--r--src/input_common/input_poller.cpp2
-rw-r--r--src/yuzu/configuration/configure_input_player.cpp2
-rw-r--r--src/yuzu/configuration/configure_input_player.ui8
3 files changed, 6 insertions, 6 deletions
diff --git a/src/input_common/input_poller.cpp b/src/input_common/input_poller.cpp
index 99d6c3cd6..49ccb4422 100644
--- a/src/input_common/input_poller.cpp
+++ b/src/input_common/input_poller.cpp
@@ -732,7 +732,7 @@ std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateHatButtonDevice(
732std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateStickDevice( 732std::unique_ptr<Common::Input::InputDevice> InputFactory::CreateStickDevice(
733 const Common::ParamPackage& params) { 733 const Common::ParamPackage& params) {
734 const auto deadzone = std::clamp(params.Get("deadzone", 0.15f), 0.0f, 1.0f); 734 const auto deadzone = std::clamp(params.Get("deadzone", 0.15f), 0.0f, 1.0f);
735 const auto range = std::clamp(params.Get("range", 1.0f), 0.25f, 1.50f); 735 const auto range = std::clamp(params.Get("range", 0.95f), 0.25f, 1.50f);
736 const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f); 736 const auto threshold = std::clamp(params.Get("threshold", 0.5f), 0.0f, 1.0f);
737 const PadIdentifier identifier = { 737 const PadIdentifier identifier = {
738 .guid = Common::UUID{params.Get("guid", "")}, 738 .guid = Common::UUID{params.Get("guid", "")},
diff --git a/src/yuzu/configuration/configure_input_player.cpp b/src/yuzu/configuration/configure_input_player.cpp
index b4f5d172a..cb622bc37 100644
--- a/src/yuzu/configuration/configure_input_player.cpp
+++ b/src/yuzu/configuration/configure_input_player.cpp
@@ -988,7 +988,7 @@ void ConfigureInputPlayer::UpdateUI() {
988 slider_value = static_cast<int>(param.Get("deadzone", 0.15f) * 100); 988 slider_value = static_cast<int>(param.Get("deadzone", 0.15f) * 100);
989 deadzone_label->setText(tr("Deadzone: %1%").arg(slider_value)); 989 deadzone_label->setText(tr("Deadzone: %1%").arg(slider_value));
990 deadzone_slider->setValue(slider_value); 990 deadzone_slider->setValue(slider_value);
991 range_spinbox->setValue(static_cast<int>(param.Get("range", 1.0f) * 100)); 991 range_spinbox->setValue(static_cast<int>(param.Get("range", 0.95f) * 100));
992 } else { 992 } else {
993 slider_value = static_cast<int>(param.Get("modifier_scale", 0.5f) * 100); 993 slider_value = static_cast<int>(param.Get("modifier_scale", 0.5f) * 100);
994 modifier_label->setText(tr("Modifier Range: %1%").arg(slider_value)); 994 modifier_label->setText(tr("Modifier Range: %1%").arg(slider_value));
diff --git a/src/yuzu/configuration/configure_input_player.ui b/src/yuzu/configuration/configure_input_player.ui
index 756a414b5..a62b57501 100644
--- a/src/yuzu/configuration/configure_input_player.ui
+++ b/src/yuzu/configuration/configure_input_player.ui
@@ -754,13 +754,13 @@
754 <string>%</string> 754 <string>%</string>
755 </property> 755 </property>
756 <property name="minimum"> 756 <property name="minimum">
757 <number>50</number> 757 <number>25</number>
758 </property> 758 </property>
759 <property name="maximum"> 759 <property name="maximum">
760 <number>150</number> 760 <number>150</number>
761 </property> 761 </property>
762 <property name="value"> 762 <property name="value">
763 <number>100</number> 763 <number>95</number>
764 </property> 764 </property>
765 </widget> 765 </widget>
766 </item> 766 </item>
@@ -2985,13 +2985,13 @@
2985 <string>%</string> 2985 <string>%</string>
2986 </property> 2986 </property>
2987 <property name="minimum"> 2987 <property name="minimum">
2988 <number>50</number> 2988 <number>25</number>
2989 </property> 2989 </property>
2990 <property name="maximum"> 2990 <property name="maximum">
2991 <number>150</number> 2991 <number>150</number>
2992 </property> 2992 </property>
2993 <property name="value"> 2993 <property name="value">
2994 <number>100</number> 2994 <number>95</number>
2995 </property> 2995 </property>
2996 </widget> 2996 </widget>
2997 </item> 2997 </item>