summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZach Hilman <zachhilman@gmail.com>2018-11-02 03:02:44 +0100
committerZach Hilman <zachhilman@gmail.com>2018-11-19 05:22:36 +0100
commite9145c3e1671d0a3d2293e5b11f70649918a3d45 (patch)
tree58c003e1124a88738d78f94bca52135ea5bf513c
parenthid: Add controller bindings for Mouse controller (diff)
downloadyuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar.gz
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar.bz2
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar.lz
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar.xz
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.tar.zst
yuzu-e9145c3e1671d0a3d2293e5b11f70649918a3d45.zip
-rw-r--r--src/core/hle/service/hid/controllers/touchscreen.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp
index 07244fe4e..8b9763de6 100644
--- a/src/core/hle/service/hid/controllers/touchscreen.cpp
+++ b/src/core/hle/service/hid/controllers/touchscreen.cpp
@@ -42,19 +42,19 @@ void Controller_Touchscreen::OnUpdate(u8* data, std::size_t size) {
const auto [x, y, pressed] = touch_device->GetStatus();
auto& touch_entry = cur_entry.states[0];
touch_entry.attribute.raw = 0;
- if (pressed) {
+ if (pressed && Settings::values.touchscreen.enabled) {
if (cur_entry.entry_count == 0) {
touch_entry.attribute.start_touch.Assign(1);
}
touch_entry.x = static_cast<u16>(x * Layout::ScreenUndocked::Width);
touch_entry.y = static_cast<u16>(y * Layout::ScreenUndocked::Height);
- touch_entry.diameter_x = 15;
- touch_entry.diameter_y = 15;
- touch_entry.rotation_angle = 0;
+ touch_entry.diameter_x = Settings::values.touchscreen.diameter_x;
+ touch_entry.diameter_y = Settings::values.touchscreen.diameter_y;
+ touch_entry.rotation_angle = Settings::values.touchscreen.rotation_angle;
const u64 tick = CoreTiming::GetTicks();
touch_entry.delta_time = tick - last_touch;
last_touch = tick;
- touch_entry.finger = 0;
+ touch_entry.finger = Settings::values.touchscreen.finger;
cur_entry.entry_count = 1;
} else {
if (cur_entry.entry_count == 1) {
@@ -67,6 +67,6 @@ void Controller_Touchscreen::OnUpdate(u8* data, std::size_t size) {
}
void Controller_Touchscreen::OnLoadInputDevices() {
- touch_device = Input::CreateDevice<Input::TouchDevice>(Settings::values.touch_device);
+ touch_device = Input::CreateDevice<Input::TouchDevice>(Settings::values.touchscreen.device);
}
} // namespace Service::HID