summaryrefslogtreecommitdiffstats
path: root/src/core/frontend/emu_window.h
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2021-09-21 02:50:30 +0200
committerNarr the Reg <juangerman-13@hotmail.com>2021-11-25 03:30:23 +0100
commit173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb (patch)
treeabd7de0aa3e952385066dec834a854b2da068522 /src/core/frontend/emu_window.h
parentyuzu: Update frontend (diff)
downloadyuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar.gz
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar.bz2
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar.lz
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar.xz
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.tar.zst
yuzu-173a6b1e57c71e8bfe7a1492d5fe9b6b3e81a6cb.zip
Diffstat (limited to '')
-rw-r--r--src/core/frontend/emu_window.h30
1 files changed, 5 insertions, 25 deletions
diff --git a/src/core/frontend/emu_window.h b/src/core/frontend/emu_window.h
index 8a86a1d27..e413a520a 100644
--- a/src/core/frontend/emu_window.h
+++ b/src/core/frontend/emu_window.h
@@ -113,28 +113,6 @@ public:
virtual bool IsShown() const = 0;
/**
- * Signal that a touch pressed event has occurred (e.g. mouse click pressed)
- * @param framebuffer_x Framebuffer x-coordinate that was pressed
- * @param framebuffer_y Framebuffer y-coordinate that was pressed
- * @param id Touch event ID
- */
- void TouchPressed(u32 framebuffer_x, u32 framebuffer_y, size_t id);
-
- /**
- * Signal that a touch released event has occurred (e.g. mouse click released)
- * @param id Touch event ID
- */
- void TouchReleased(size_t id);
-
- /**
- * Signal that a touch movement event has occurred (e.g. mouse was moved over the emu window)
- * @param framebuffer_x Framebuffer x-coordinate
- * @param framebuffer_y Framebuffer y-coordinate
- * @param id Touch event ID
- */
- void TouchMoved(u32 framebuffer_x, u32 framebuffer_y, size_t id);
-
- /**
* Returns currently active configuration.
* @note Accesses to the returned object need not be consistent because it may be modified in
* another thread
@@ -212,6 +190,11 @@ protected:
client_area_height = size.second;
}
+ /**
+ * Converts a screen postion into the equivalent touchscreen position.
+ */
+ std::pair<f32, f32> MapToTouchScreen(u32 framebuffer_x, u32 framebuffer_y) const;
+
WindowSystemInfo window_info;
private:
@@ -237,9 +220,6 @@ private:
WindowConfig config; ///< Internal configuration (changes pending for being applied in
/// ProcessConfigurationChanges)
WindowConfig active_config; ///< Internal active configuration
-
- class TouchState;
- std::shared_ptr<TouchState> touch_state;
};
} // namespace Core::Frontend