diff options
author | bunnei <bunneidev@gmail.com> | 2015-03-09 05:14:59 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-03-11 04:58:07 +0100 |
commit | d61b26b79f889603a084e148626bba3c267cf75f (patch) | |
tree | d793edd22e25a99aa5c13cc2455a5ec2167afee7 /src/citra_qt/bootmanager.cpp | |
parent | EmuWindow: Made pad/touch functions non-static. (diff) | |
download | yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.gz yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.bz2 yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.lz yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.xz yuzu-d61b26b79f889603a084e148626bba3c267cf75f.tar.zst yuzu-d61b26b79f889603a084e148626bba3c267cf75f.zip |
Diffstat (limited to '')
-rw-r--r-- | src/citra_qt/bootmanager.cpp | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/src/citra_qt/bootmanager.cpp b/src/citra_qt/bootmanager.cpp index cf07e65cc..b81bd6167 100644 --- a/src/citra_qt/bootmanager.cpp +++ b/src/citra_qt/bootmanager.cpp @@ -268,39 +268,33 @@ QByteArray GRenderWindow::saveGeometry() void GRenderWindow::keyPressEvent(QKeyEvent* event) { - EmuWindow::KeyPressed({event->key(), keyboard_id}); - Service::HID::PadUpdateComplete(); + this->KeyPressed({event->key(), keyboard_id}); } void GRenderWindow::keyReleaseEvent(QKeyEvent* event) { - EmuWindow::KeyReleased({event->key(), keyboard_id}); - Service::HID::PadUpdateComplete(); + this->KeyReleased({event->key(), keyboard_id}); } void GRenderWindow::mousePressEvent(QMouseEvent *event) { - if (event->button() == Qt::LeftButton) { + if (event->button() == Qt::LeftButton) + { auto pos = event->pos(); - EmuWindow::TouchPressed(GetFramebufferLayout(), static_cast<u16>(pos.x()), - static_cast<u16>(pos.y())); + this->TouchPressed(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y())); } } void GRenderWindow::mouseMoveEvent(QMouseEvent *event) { auto pos = event->pos(); - EmuWindow::TouchMoved(GetFramebufferLayout(), static_cast<u16>(pos.x()), - static_cast<u16>(pos.y())); + this->TouchMoved(static_cast<unsigned>(pos.x()), static_cast<unsigned>(pos.y())); } void GRenderWindow::mouseReleaseEvent(QMouseEvent *event) { - if (event->button() == Qt::LeftButton) { - auto pos = event->pos(); - EmuWindow::TouchReleased(GetFramebufferLayout(), static_cast<u16>(pos.x()), - static_cast<u16>(pos.y())); - } + if (event->button() == Qt::LeftButton) + this->TouchReleased(); } void GRenderWindow::ReloadSetKeymaps() |