diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/bootmanager.cpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/yuzu/bootmanager.cpp b/src/yuzu/bootmanager.cpp index e38bc7a9a..d62b0efc2 100644 --- a/src/yuzu/bootmanager.cpp +++ b/src/yuzu/bootmanager.cpp | |||
| @@ -382,7 +382,12 @@ void GRenderWindow::keyReleaseEvent(QKeyEvent* event) { | |||
| 382 | } | 382 | } |
| 383 | 383 | ||
| 384 | void GRenderWindow::mousePressEvent(QMouseEvent* event) { | 384 | void GRenderWindow::mousePressEvent(QMouseEvent* event) { |
| 385 | // touch input is handled in TouchBeginEvent | 385 | if (!Settings::values.touchscreen.enabled) { |
| 386 | input_subsystem->GetKeyboard()->PressKey(event->button()); | ||
| 387 | return; | ||
| 388 | } | ||
| 389 | |||
| 390 | // Touch input is handled in TouchBeginEvent | ||
| 386 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { | 391 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { |
| 387 | return; | 392 | return; |
| 388 | } | 393 | } |
| @@ -398,7 +403,7 @@ void GRenderWindow::mousePressEvent(QMouseEvent* event) { | |||
| 398 | } | 403 | } |
| 399 | 404 | ||
| 400 | void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { | 405 | void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { |
| 401 | // touch input is handled in TouchUpdateEvent | 406 | // Touch input is handled in TouchUpdateEvent |
| 402 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { | 407 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { |
| 403 | return; | 408 | return; |
| 404 | } | 409 | } |
| @@ -411,7 +416,12 @@ void GRenderWindow::mouseMoveEvent(QMouseEvent* event) { | |||
| 411 | } | 416 | } |
| 412 | 417 | ||
| 413 | void GRenderWindow::mouseReleaseEvent(QMouseEvent* event) { | 418 | void GRenderWindow::mouseReleaseEvent(QMouseEvent* event) { |
| 414 | // touch input is handled in TouchEndEvent | 419 | if (!Settings::values.touchscreen.enabled) { |
| 420 | input_subsystem->GetKeyboard()->ReleaseKey(event->button()); | ||
| 421 | return; | ||
| 422 | } | ||
| 423 | |||
| 424 | // Touch input is handled in TouchEndEvent | ||
| 415 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { | 425 | if (event->source() == Qt::MouseEventSynthesizedBySystem) { |
| 416 | return; | 426 | return; |
| 417 | } | 427 | } |