diff options
| author | 2015-03-11 21:28:57 -0400 | |
|---|---|---|
| committer | 2015-03-11 21:28:57 -0400 | |
| commit | ed5b275d21612906e6eeb4b1f344aa0f1eb31c10 (patch) | |
| tree | 54ffc1fe7163996fdaed1cb5cd948015409dcac6 /src/citra_qt/bootmanager.cpp | |
| parent | Merge pull request #629 from archshift/lcdfb (diff) | |
| parent | hid_user: Removed unnecessary includes. (diff) | |
| download | yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.gz yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.tar.xz yuzu-ed5b275d21612906e6eeb4b1f344aa0f1eb31c10.zip | |
Merge pull request #642 from bunnei/touchpad
Touchpad support
Diffstat (limited to 'src/citra_qt/bootmanager.cpp')
| -rw-r--r-- | src/citra_qt/bootmanager.cpp | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index a040e75c1..b81bd6167 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp | |||
| @@ -268,14 +268,33 @@ QByteArray GRenderWindow::saveGeometry() | |||
| 268 | 268 | ||
| 269 | void GRenderWindow::keyPressEvent(QKeyEvent* event) | 269 | void GRenderWindow::keyPressEvent(QKeyEvent* event) |
| 270 | { | 270 | { |
| 271 | EmuWindow::KeyPressed({event->key(), keyboard_id}); | 271 | this->KeyPressed({event->key(), keyboard_id}); |
| 272 | Service::HID::PadUpdateComplete(); | ||
| 273 | } | 272 | } |
| 274 | 273 | ||
| 275 | void GRenderWindow::keyReleaseEvent(QKeyEvent* event) | 274 | void GRenderWindow::keyReleaseEvent(QKeyEvent* event) |
| 276 | { | 275 | { |
| 277 | EmuWindow::KeyReleased({event->key(), keyboard_id}); | 276 | this->KeyReleased({event->key(), keyboard_id}); |
| 278 | Service::HID::PadUpdateComplete(); | 277 | } |
| 278 | |||
| 279 | void GRenderWindow::mousePressEvent(QMouseEvent *event) | ||
| 280 | { | ||
| 281 | if (event->button() == Qt::LeftButton) | ||
| 282 | { | ||
| 283 | auto pos = event->pos(); | ||
| 284 | this->TouchPressed(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y())); | ||
| 285 | } | ||
| 286 | } | ||
| 287 | |||
| 288 | void GRenderWindow::mouseMoveEvent(QMouseEvent *event) | ||
| 289 | { | ||
| 290 | auto pos = event->pos(); | ||
| 291 | this->TouchMoved(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y())); | ||
| 292 | } | ||
| 293 | |||
| 294 | void GRenderWindow::mouseReleaseEvent(QMouseEvent *event) | ||
| 295 | { | ||
| 296 | if (event->button() == Qt::LeftButton) | ||
| 297 | this->TouchReleased(); | ||
| 279 | } | 298 | } |
| 280 | 299 | ||
| 281 | void GRenderWindow::ReloadSetKeymaps() | 300 | void GRenderWindow::ReloadSetKeymaps() |