summaryrefslogtreecommitdiffstats
path: root/src/input_common/touch_from_button.cpp
diff options
context:
space:
mode:
authorFearlessTobi <thm.frey@gmail.com>2020-08-29 20:56:51 +0200
committerFearlessTobi <thm.frey@gmail.com>2020-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
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.gz
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.bz2
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.lz
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.xz
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.tar.zst
yuzu-d176feffad824bce20b694432ade28fe8273c8e4.zip
Diffstat (limited to '')
-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:
static_cast<int>(Layout::ScreenUndocked::Width);
const float y = static_cast<float>(std::get<2>(m)) /
static_cast<int>(Layout::ScreenUndocked::Height);
- return std::make_tuple(x, y, true);
+ return {x, y, true};
}
}
- return std::make_tuple(0.0f, 0.0f, false);
+ return {};
}
private:
- std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map; // button, x, y
+ // A vector of the mapped button, its x and its y-coordinate
+ std::vector<std::tuple<std::unique_ptr<Input::ButtonDevice>, int, int>> map;
};
std::unique_ptr<Input::TouchDevice> TouchFromButtonFactory::Create(