diff options
| author |  Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2015-05-29 15:09:26 -0700 |
| commit | a489a846563fc64f236c7ede69ce0eb34af3521a (patch) | |
| tree | 706e345043532d90cd8ca5c41af67fc31dfa7d2e /src/common/emu_window.cpp | |
| parent | Merge pull request #817 from linkmauve/citra.ico (diff) | |
| parent | Travis: Add a check for trailing whitespace before any actual compilation. (diff) | |
| download | yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.gz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.tar.xz yuzu-a489a846563fc64f236c7ede69ce0eb34af3521a.zip | |
Merge pull request #818 from linkmauve/no-trailing-whitespace
Ban trailing whitespace from the entire project, forever
Diffstat (limited to 'src/common/emu_window.cpp')
| -rw-r--r-- | src/common/emu_window.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/emu_window.cpp b/src/common/emu_window.cpp index f5b6c7301..43facb85c 100644 --- a/src/common/emu_window.cpp +++ b/src/common/emu_window.cpp | |||
| @@ -32,7 +32,7 @@ std::tuple<unsigned,unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsig | |||
| 32 | 32 | ||
| 33 | new_x = std::max(new_x, framebuffer_layout.bottom_screen.left); | 33 | new_x = std::max(new_x, framebuffer_layout.bottom_screen.left); |
| 34 | new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1); | 34 | new_x = std::min(new_x, framebuffer_layout.bottom_screen.right-1); |
| 35 | 35 | ||
| 36 | new_y = std::max(new_y, framebuffer_layout.bottom_screen.top); | 36 | new_y = std::max(new_y, framebuffer_layout.bottom_screen.top); |
| 37 | new_y = std::min(new_y, framebuffer_layout.bottom_screen.bottom-1); | 37 | new_y = std::min(new_y, framebuffer_layout.bottom_screen.bottom-1); |
| 38 | 38 | ||