summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/common')
-rw-r--r--src/common/emu_window.cpp2
-rw-r--r--src/common/emu_window.h15
2 files changed, 6 insertions, 11 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp
index 11e6ad76b..89bb89481 100644
--- a/src/common/emu_window.cpp
+++ b/src/common/emu_window.cpp
@@ -5,8 +5,6 @@
#include "emu_window.h"
#include "video_core/video_core.h"
-bool EmuWindow::touch_pressed = false;
-
void EmuWindow::KeyPressed(KeyMap::HostDeviceKey key) {
Service::HID::PadState mapped_key = KeyMap::GetPadKey(key);
diff --git a/src/common/emu_window.h b/src/common/emu_window.h
index df81e9e0f..8e4b510e9 100644
--- a/src/common/emu_window.h
+++ b/src/common/emu_window.h
@@ -71,10 +71,10 @@ public:
virtual void ReloadSetKeymaps() = 0;
/// Signals a key press action to the HID module
- static void KeyPressed(KeyMap::HostDeviceKey key);
+ void KeyPressed(KeyMap::HostDeviceKey key);
/// Signals a key release action to the HID module
- static void KeyReleased(KeyMap::HostDeviceKey key);
+ void KeyReleased(KeyMap::HostDeviceKey key);
/**
* Signal that a touch pressed event has occurred (e.g. mouse click pressed)
@@ -82,8 +82,7 @@ public:
* @param framebuffer_x Framebuffer x-coordinate that was pressed
* @param framebuffer_y Framebuffer y-coordinate that was pressed
*/
- static void TouchPressed(const FramebufferLayout& layout, unsigned framebuffer_x,
- unsigned framebuffer_y);
+ void TouchPressed(const FramebufferLayout& layout, unsigned framebuffer_x, unsigned framebuffer_y);
/**
* Signal that a touch released event has occurred (e.g. mouse click released)
@@ -91,8 +90,7 @@ public:
* @param framebuffer_x Framebuffer x-coordinate that was released
* @param framebuffer_y Framebuffer y-coordinate that was released
*/
- static void TouchReleased(const FramebufferLayout& layout, unsigned framebuffer_x,
- unsigned framebuffer_y);
+ void TouchReleased(const FramebufferLayout& layout, unsigned framebuffer_x, unsigned framebuffer_y);
/**
* Signal that a touch movement event has occurred (e.g. mouse was moved over the emu window)
@@ -100,8 +98,7 @@ public:
* @param framebuffer_x Framebuffer x-coordinate
* @param framebuffer_y Framebuffer y-coordinate
*/
- static void TouchMoved(const FramebufferLayout& layout, unsigned framebuffer_x,
- unsigned framebuffer_y);
+ void TouchMoved(const FramebufferLayout& layout, unsigned framebuffer_x, unsigned framebuffer_y);
/**
* Returns currently active configuration.
@@ -196,5 +193,5 @@ private:
WindowConfig config; ///< Internal configuration (changes pending for being applied in ProcessConfigurationChanges)
WindowConfig active_config; ///< Internal active configuration
- static bool touch_pressed; ///< True if touchpad area is currently pressed, otherwise false
+ bool touch_pressed; ///< True if touchpad area is currently pressed, otherwise false
};