summaryrefslogtreecommitdiff
path: root/src/input_common/touch_from_button.cpp
diff options
context:
space:
mode:
authorGravatar FearlessTobi2020-08-29 20:56:51 +0200
committerGravatar FearlessTobi2020-08-29 20:56:51 +0200
commitd176feffad824bce20b694432ade28fe8273c8e4 (patch)
treea3c6f12346244a3757490327e3ff6e5bed09cbcb /src/input_common/touch_from_button.cpp
parentyuzu: Add motion and touch configuration (diff)
downloadyuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.gz
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.xz
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.zip
Address review comments and fix code compilation
Diffstat (limited to 'src/input_common/touch_from_button.cpp')
-rw-r--r--src/input_common/touch_from_button.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/input_common/touch_from_button.cpp b/src/input_common/touch_from_button.cpp
index 8e7f90253..d028dfa0d 100644
--- a/src/input_common/touch_from_button.cpp
+++ b/src/input_common/touch_from_button.cpp
@@ -30,14 +30,15 @@ public:
30 static_cast<int>(Layout::ScreenUndocked::Width); 30 static_cast<int>(Layout::ScreenUndocked::Width);
31 const float y = static_cast<float>(std::get<2>(m)) / 31 const float y = static_cast<float>(std::get<2>(m)) /
32 static_cast<int>(Layout::ScreenUndocked::Height); 32 static_cast<int>(Layout::ScreenUndocked::Height);
33 return std::make_tuple(x, y, true); 33 return {x, y, true};
34 } 34 }
35 } 35 }
36 return std::make_tuple(0.0f, 0.0f, false); 36 return {};
37 } 37 }
38 38
39private: 39private:
40 std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; // button, x, y 40 // A vector of the mapped button, its x and its y-coordinate
41 std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map;
41}; 42};
42 43
43std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create( 44std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(