summaryrefslogtreecommitdiff
path: root/src/input_common/mouse/mouse_input.h
diff options
context:
space:
mode:
authorGravatar bunnei2020-12-03 10:24:54 -0800
committerGravatar GitHub2020-12-03 10:24:54 -0800
commit843ef8f2ec8b1645e7aa5eec7fcc8a76f0d3b666 (patch)
treebe233f27eb9502b1489db99a1448eb0a9cd33e96 /src/input_common/mouse/mouse_input.h
parentMerge pull request #5000 from lioncash/audio-error (diff)
parentmouse_poller: Remove unused includes (diff)
downloadyuzu-843ef8f2ec8b1645e7aa5eec7fcc8a76f0d3b666.tar.gz
yuzu-843ef8f2ec8b1645e7aa5eec7fcc8a76f0d3b666.tar.xz
yuzu-843ef8f2ec8b1645e7aa5eec7fcc8a76f0d3b666.zip
Merge pull request #5059 from lioncash/mouse
mouse_input/mouse_poller: Minor cleanup
Diffstat (limited to 'src/input_common/mouse/mouse_input.h')
-rw-r--r--src/input_common/mouse/mouse_input.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/input_common/mouse/mouse_input.h b/src/input_common/mouse/mouse_input.h
index 761663334..65e64bee7 100644
--- a/src/input_common/mouse/mouse_input.h
+++ b/src/input_common/mouse/mouse_input.h
@@ -4,15 +4,14 @@
4 4
5#pragma once 5#pragma once
6 6
7#include <algorithm> 7#include <array>
8#include <functional>
9#include <mutex> 8#include <mutex>
10#include <thread> 9#include <thread>
11#include <unordered_map> 10
12#include "common/common_types.h" 11#include "common/common_types.h"
13#include "common/threadsafe_queue.h" 12#include "common/threadsafe_queue.h"
13#include "common/vector_math.h"
14#include "core/frontend/input.h" 14#include "core/frontend/input.h"
15#include "input_common/main.h"
16#include "input_common/motion_input.h" 15#include "input_common/motion_input.h"
17 16
18namespace MouseInput { 17namespace MouseInput {
@@ -50,7 +49,7 @@ public:
50 * Signals that a button is pressed. 49 * Signals that a button is pressed.
51 * @param x the x-coordinate of the cursor 50 * @param x the x-coordinate of the cursor
52 * @param y the y-coordinate of the cursor 51 * @param y the y-coordinate of the cursor
53 * @param button the button pressed 52 * @param button_ the button pressed
54 */ 53 */
55 void PressButton(int x, int y, int button_); 54 void PressButton(int x, int y, int button_);
56 55