N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

frontend: Fix clicking primary screen window touching screen. (#6707)

Browse source
This commit is contained in:
Steveice10 2023-07-20 15:48:50 -07:00 committed by GitHub
parent 71582a72a4
commit a9e390b1b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/core/frontend/emu_window.cpp
View file

@ -55,15 +55,17 @@ EmuWindow::EmuWindow(bool is_secondary_) : is_secondary{is_secondary_} {
} }
EmuWindow::~EmuWindow() = default; EmuWindow::~EmuWindow() = default;
/**
* Check if the given x/y coordinates are within the touchpad specified by the framebuffer layout bool EmuWindow::IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigned framebuffer_x,
* @param layout FramebufferLayout object describing the framebuffer size and screen positions unsigned framebuffer_y) {
* @param framebuffer_x Framebuffer x-coordinate to check #ifndef ANDROID
* @param framebuffer_y Framebuffer y-coordinate to check // If separate windows and the touch is in the primary (top) screen, ignore it.
* @return True if the coordinates are within the touchpad, otherwise false if (Settings::values.layout_option.GetValue() == Settings::LayoutOption::SeparateWindows &&
*/ !is_secondary && !Settings::values.swap_screen.GetValue()) {
static bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigned framebuffer_x, return false;
unsigned framebuffer_y) { }
#endif
if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) { if (Settings::values.render_3d.GetValue() == Settings::StereoRenderOption::SideBySide) {
return (framebuffer_y >= layout.bottom_screen.top && return (framebuffer_y >= layout.bottom_screen.top &&
framebuffer_y < layout.bottom_screen.bottom && framebuffer_y < layout.bottom_screen.bottom &&

11
src/core/frontend/emu_window.h
View file

@ -288,6 +288,17 @@ private:
void CreateTouchState(); void CreateTouchState();
/**
* Check if the given x/y coordinates are within the touchpad specified by the framebuffer
* layout
* @param layout FramebufferLayout object describing the framebuffer size and screen positions
* @param framebuffer_x Framebuffer x-coordinate to check
* @param framebuffer_y Framebuffer y-coordinate to check
* @return True if the coordinates are within the touchpad, otherwise false
*/
bool IsWithinTouchscreen(const Layout::FramebufferLayout& layout, unsigned framebuffer_x,
unsigned framebuffer_y);
Layout::FramebufferLayout framebuffer_layout; ///< Current framebuffer layout Layout::FramebufferLayout framebuffer_layout; ///< Current framebuffer layout
WindowConfig config{}; ///< Internal configuration (changes pending for being applied in WindowConfig config{}; ///< Internal configuration (changes pending for being applied in