diff options
| author | 2020-10-13 16:20:44 -0300 | |
|---|---|---|
| committer | 2020-10-13 16:20:44 -0300 | |
| commit | c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88 (patch) | |
| tree | 9565ff464bbb9e5a0aa66e6e310098314e88d019 /src/core/frontend/emu_window.cpp | |
| parent | Merge pull request #3929 from FearlessTobi/ticket-keys (diff) | |
| parent | core/CMakeLists: Make some warnings errors (diff) | |
| download | yuzu-c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88.tar.gz yuzu-c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88.tar.xz yuzu-c5b3c8d06bcfa343b2cecbfc60b3530b306ebe88.zip | |
Merge pull request #4786 from lioncash/flags
core/CMakeLists: Make some warnings errors
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
| -rw-r--r-- | src/core/frontend/emu_window.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 9a081fbd4..8c1193894 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp | |||
| @@ -84,10 +84,12 @@ void EmuWindow::TouchPressed(unsigned framebuffer_x, unsigned framebuffer_y) { | |||
| 84 | return; | 84 | return; |
| 85 | 85 | ||
| 86 | std::lock_guard guard{touch_state->mutex}; | 86 | std::lock_guard guard{touch_state->mutex}; |
| 87 | touch_state->touch_x = static_cast<float>(framebuffer_x - framebuffer_layout.screen.left) / | 87 | touch_state->touch_x = |
| 88 | (framebuffer_layout.screen.right - framebuffer_layout.screen.left); | 88 | static_cast<float>(framebuffer_x - framebuffer_layout.screen.left) / |
| 89 | touch_state->touch_y = static_cast<float>(framebuffer_y - framebuffer_layout.screen.top) / | 89 | static_cast<float>(framebuffer_layout.screen.right - framebuffer_layout.screen.left); |
| 90 | (framebuffer_layout.screen.bottom - framebuffer_layout.screen.top); | 90 | touch_state->touch_y = |
| 91 | static_cast<float>(framebuffer_y - framebuffer_layout.screen.top) / | ||
| 92 | static_cast<float>(framebuffer_layout.screen.bottom - framebuffer_layout.screen.top); | ||
| 91 | 93 | ||
| 92 | touch_state->touch_pressed = true; | 94 | touch_state->touch_pressed = true; |
| 93 | } | 95 | } |