From fc63e74c2b2b697e80cb65ed3bb8956b699225f4 Mon Sep 17 00:00:00 2001 From: Matteo Golinelli Date: Wed, 6 May 2026 17:10:10 +0200 Subject: [PATCH] InputManager: Fix touch monitor focus ordering --- src/config/supplementary/propRefresher/PropRefresher.cpp | 4 ++-- src/managers/input/Touch.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/config/supplementary/propRefresher/PropRefresher.cpp b/src/config/supplementary/propRefresher/PropRefresher.cpp index 675a68ef0..36b412daf 100644 --- a/src/config/supplementary/propRefresher/PropRefresher.cpp +++ b/src/config/supplementary/propRefresher/PropRefresher.cpp @@ -21,7 +21,7 @@ UP& Supplementary::refresher() { } void CPropRefresher::scheduleRefresh(PropRefreshBits prop) { - static auto PZOOMFACTOR = CConfigValue("cursor.zoom_factor"); + static auto PZOOMFACTOR = CConfigValue("cursor:zoom_factor"); m_propsTripped |= prop; @@ -102,4 +102,4 @@ void CPropRefresher::scheduleRefresh(PropRefreshBits prop) { m_scheduled = true; } -} \ No newline at end of file +} diff --git a/src/managers/input/Touch.cpp b/src/managers/input/Touch.cpp index f49db8b78..bf0b2dccb 100644 --- a/src/managers/input/Touch.cpp +++ b/src/managers/input/Touch.cpp @@ -32,13 +32,13 @@ void CInputManager::onTouchDown(ITouch::SDownEvent e) { PMONITOR = PMONITOR ? PMONITOR : Desktop::focusState()->monitor(); + if (PMONITOR != Desktop::focusState()->monitor()) + Desktop::focusState()->rawMonitorFocus(PMONITOR); + const auto TOUCH_COORDS = PMONITOR->m_position + (e.pos * PMONITOR->m_size); refocus(TOUCH_COORDS); - if (PMONITOR != Desktop::focusState()->monitor()) - Desktop::focusState()->rawMonitorFocus(PMONITOR); - if (m_clickBehavior == CLICKMODE_KILL) { IPointer::SButtonEvent e; e.state = WL_POINTER_BUTTON_STATE_PRESSED;