summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/common/settings.h2
-rw-r--r--src/input_common/mouse/mouse_poller.cpp2
-rw-r--r--src/yuzu/configuration/configure_input_advanced.ui15
3 files changed, 8 insertions, 11 deletions
diff --git a/src/common/settings.h b/src/common/settings.h
index 898798212..7c6878f62 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -365,7 +365,7 @@ struct Values {
365 "udp_input_servers"}; 365 "udp_input_servers"};
366 366
367 BasicSetting<bool> mouse_panning{false, "mouse_panning"}; 367 BasicSetting<bool> mouse_panning{false, "mouse_panning"};
368 BasicSetting<float> mouse_panning_sensitivity{1.0f, "mouse_panning_sensitivity"}; 368 BasicSetting<u8> mouse_panning_sensitivity{1, "mouse_panning_sensitivity"};
369 BasicSetting<bool> mouse_enabled{false, "mouse_enabled"}; 369 BasicSetting<bool> mouse_enabled{false, "mouse_enabled"};
370 std::string mouse_device; 370 std::string mouse_device;
371 MouseButtonsRaw mouse_buttons; 371 MouseButtonsRaw mouse_buttons;
diff --git a/src/input_common/mouse/mouse_poller.cpp b/src/input_common/mouse/mouse_poller.cpp
index 45b3d7340..1e84eaddd 100644
--- a/src/input_common/mouse/mouse_poller.cpp
+++ b/src/input_common/mouse/mouse_poller.cpp
@@ -84,7 +84,7 @@ public:
84 std::lock_guard lock{mutex}; 84 std::lock_guard lock{mutex};
85 const auto axis_value = 85 const auto axis_value =
86 static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis)); 86 static_cast<float>(mouse_input->GetMouseState(button).axis.at(axis));
87 const float sensitivity = Settings::values.mouse_panning_sensitivity.GetValue(); 87 const float sensitivity = Settings::values.mouse_panning_sensitivity.GetValue() * 0.15f;
88 return axis_value * sensitivity / (100.0f * range); 88 return axis_value * sensitivity / (100.0f * range);
89 } 89 }
90 90
diff --git a/src/yuzu/configuration/configure_input_advanced.ui b/src/yuzu/configuration/configure_input_advanced.ui
index 173130d8d..d3ef5bd06 100644
--- a/src/yuzu/configuration/configure_input_advanced.ui
+++ b/src/yuzu/configuration/configure_input_advanced.ui
@@ -2573,27 +2573,24 @@
2573 </widget> 2573 </widget>
2574 </item> 2574 </item>
2575 <item row="2" column="2"> 2575 <item row="2" column="2">
2576 <widget class="QDoubleSpinBox" name="mouse_panning_sensitivity"> 2576 <widget class="QSpinBox" name="mouse_panning_sensitivity">
2577 <property name="toolTip"> 2577 <property name="toolTip">
2578 <string>Mouse sensitivity</string> 2578 <string>Mouse sensitivity</string>
2579 </property> 2579 </property>
2580 <property name="alignment"> 2580 <property name="alignment">
2581 <set>Qt::AlignCenter</set> 2581 <set>Qt::AlignCenter</set>
2582 </property> 2582 </property>
2583 <property name="decimals"> 2583 <property name="suffix">
2584 <number>2</number> 2584 <string>%</string>
2585 </property> 2585 </property>
2586 <property name="minimum"> 2586 <property name="minimum">
2587 <double>0.100000000000000</double> 2587 <number>1</number>
2588 </property> 2588 </property>
2589 <property name="maximum"> 2589 <property name="maximum">
2590 <double>16.000000000000000</double> 2590 <number>100</number>
2591 </property>
2592 <property name="singleStep">
2593 <double>0.010000000000000</double>
2594 </property> 2591 </property>
2595 <property name="value"> 2592 <property name="value">
2596 <double>1.000000000000000</double> 2593 <number>100</number>
2597 </property> 2594 </property>
2598 </widget> 2595 </widget>
2599 </item> 2596 </item>