diff options
| author | 2015-03-08 03:42:40 -0400 | |
|---|---|---|
| committer | 2015-03-10 18:05:18 -0400 | |
| commit | f213000cc421a0d00af35e160d9dff9eea617cf6 (patch) | |
| tree | 4a0af4686f54bb04ae999061a009f8b931be3ec0 /src | |
| parent | GLFW: Implemented EmuWindow touchpad support. (diff) | |
| download | yuzu-f213000cc421a0d00af35e160d9dff9eea617cf6.tar.gz yuzu-f213000cc421a0d00af35e160d9dff9eea617cf6.tar.xz yuzu-f213000cc421a0d00af35e160d9dff9eea617cf6.zip | |
Qt: Implemented EmuWindow touchpad support.
Diffstat (limited to 'src')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 25 | ||||
| -rw-r--r-- | src/citra_qt/bootmanager.h | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index a040e75c1..cf07e65cc 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -278,6 +278,31 @@ void GRenderWindow::keyReleaseEvent(QKeyEvent* event) | |||
| 278 | Service::HID::PadUpdateComplete(); | 278 | Service::HID::PadUpdateComplete(); |
| 279 | } | 279 | } |
| 280 | 280 | ||
| 281 | void GRenderWindow::mousePressEvent(QMouseEvent *event) | ||
| 282 | { | ||
| 283 | if (event->button() == Qt::LeftButton) { | ||
| 284 | auto pos = event->pos(); | ||
| 285 | EmuWindow::TouchPressed(GetFramebufferLayout(), static_cast<u16>(pos.x()), | ||
| 286 | static_cast<u16>(pos.y())); | ||
| 287 | } | ||
| 288 | } | ||
| 289 | |||
| 290 | void GRenderWindow::mouseMoveEvent(QMouseEvent *event) | ||
| 291 | { | ||
| 292 | auto pos = event->pos(); | ||
| 293 | EmuWindow::TouchMoved(GetFramebufferLayout(), static_cast<u16>(pos.x()), | ||
| 294 | static_cast<u16>(pos.y())); | ||
| 295 | } | ||
| 296 | |||
| 297 | void GRenderWindow::mouseReleaseEvent(QMouseEvent *event) | ||
| 298 | { | ||
| 299 | if (event->button() == Qt::LeftButton) { | ||
| 300 | auto pos = event->pos(); | ||
| 301 | EmuWindow::TouchReleased(GetFramebufferLayout(), static_cast<u16>(pos.x()), | ||
| 302 | static_cast<u16>(pos.y())); | ||
| 303 | } | ||
| 304 | } | ||
| 305 | |||
| 281 | void GRenderWindow::ReloadSetKeymaps() | 306 | void GRenderWindow::ReloadSetKeymaps() |
| 282 | { | 307 | { |
| 283 | KeyMap::SetKeyMapping({Settings::values.pad_a_key, keyboard_id}, Service::HID::PAD_A); | 308 | KeyMap::SetKeyMapping({Settings::values.pad_a_key, keyboard_id}, Service::HID::PAD_A); |
diff --git a/src/citra_qt/bootmanager.h b/src/citra_qt/bootmanager.h index a55db682a..288da45a1 100644 --- a/src/citra_qt/bootmanager.h +++ b/src/citra_qt/bootmanager.h | |||
| @@ -121,6 +121,10 @@ public: | |||
| 121 | void keyPressEvent(QKeyEvent* event) override; | 121 | void keyPressEvent(QKeyEvent* event) override; |
| 122 | void keyReleaseEvent(QKeyEvent* event) override; | 122 | void keyReleaseEvent(QKeyEvent* event) override; |
| 123 | 123 | ||
| 124 | void mousePressEvent(QMouseEvent *event) override; | ||
| 125 | void mouseMoveEvent(QMouseEvent *event) override; | ||
| 126 | void mouseReleaseEvent(QMouseEvent *event) override; | ||
| 127 | |||
| 124 | void ReloadSetKeymaps() override; | 128 | void ReloadSetKeymaps() override; |
| 125 | 129 | ||
| 126 | void OnClientAreaResized(unsigned width, unsigned height); | 130 | void OnClientAreaResized(unsigned width, unsigned height); |