diff options
| author |  bunnei | 2019-02-27 11:26:24 -0500 |
|---|---|---|
| committer |  GitHub | 2019-02-27 11:26:24 -0500 |
| commit | 14430f7df96942ec06a20d293c763e46f6220206 (patch) | |
| tree | 96053ff87617924fe9ddf4a3a412fdd0aa26f53f /src/core/frontend/emu_window.cpp | |
| parent | Merge pull request #2161 from lioncash/handle-table (diff) | |
| parent | core/frontend/emu_window: Make ClipToTouchScreen a const member function (diff) | |
| download | yuzu-14430f7df96942ec06a20d293c763e46f6220206.tar.gz yuzu-14430f7df96942ec06a20d293c763e46f6220206.tar.xz yuzu-14430f7df96942ec06a20d293c763e46f6220206.zip | |
Merge pull request #2170 from lioncash/emu-window
core/frontend/emu_window: Make ClipToTouchScreen a const member function
Diffstat (limited to 'src/core/frontend/emu_window.cpp')
| -rw-r--r-- | src/core/frontend/emu_window.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/frontend/emu_window.cpp b/src/core/frontend/emu_window.cpp index 9dd493efb..e29afd630 100644 --- a/src/core/frontend/emu_window.cpp +++ b/src/core/frontend/emu_window.cpp | |||
| @@ -67,7 +67,7 @@ static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigne | |||
| 67 | framebuffer_x >= layout.screen.left && framebuffer_x < layout.screen.right); | 67 | framebuffer_x >= layout.screen.left && framebuffer_x < layout.screen.right); |
| 68 | } | 68 | } |
| 69 | 69 | ||
| 70 | std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) { | 70 | std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const { |
| 71 | new_x = std::max(new_x, framebuffer_layout.screen.left); | 71 | new_x = std::max(new_x, framebuffer_layout.screen.left); |
| 72 | new_x = std::min(new_x, framebuffer_layout.screen.right - 1); | 72 | new_x = std::min(new_x, framebuffer_layout.screen.right - 1); |
| 73 | 73 | ||