octo
/
yuzu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2170 from lioncash/emu-window 

core/frontend/emu_window: Make ClipToTouchScreen a const member function
This commit is contained in:
bunnei 2019-02-27 11:26:24 -05:00 committed by GitHub
parent eb5a3dd1c7 46b3209abb
commit 14430f7df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/frontend/emu_window.cpp
View File

@ -67,7 +67,7 @@ static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigne
framebuffer_x >= layout.screen.left && framebuffer_x < layout.screen.right); framebuffer_x >= layout.screen.left && framebuffer_x < layout.screen.right);
} }
std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) { std::tuple<unsigned, unsigned> EmuWindow::ClipToTouchScreen(unsigned new_x, unsigned new_y) const {
new_x = std::max(new_x, framebuffer_layout.screen.left); new_x = std::max(new_x, framebuffer_layout.screen.left);
new_x = std::min(new_x, framebuffer_layout.screen.right - 1); new_x = std::min(new_x, framebuffer_layout.screen.right - 1);

2
src/core/frontend/emu_window.h
View File

@ -166,7 +166,7 @@ private:
/** /**
* Clip the provided coordinates to be inside the touchscreen area. * Clip the provided coordinates to be inside the touchscreen area.
*/ */
std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y); std::tuple<unsigned, unsigned> ClipToTouchScreen(unsigned new_x, unsigned new_y) const;
}; };
} // namespace Core::Frontend } // namespace Core::Frontend