From f0046e45f197bb4760734fe08f0ffd7e9a526928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marvin=20H=C3=A4user?= <8659494+mhaeuser@users.noreply.github.com> Date: Fri, 19 Mar 2021 16:34:09 +0100 Subject: [PATCH] OcAppleEventLib: Scale click area by UIScale --- Library/OcAppleEventLib/PointerHandler.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Library/OcAppleEventLib/PointerHandler.c b/Library/OcAppleEventLib/PointerHandler.c index a0bbfb0b..b9f67c61 100644 --- a/Library/OcAppleEventLib/PointerHandler.c +++ b/Library/OcAppleEventLib/PointerHandler.c @@ -596,9 +596,11 @@ InternalHandleButtonInteraction ( if (Pointer->ButtonTicksHold <= mMaximumClickDuration) { HorizontalMovement = ABS(Pointer->MouseDownPosition.Horizontal - mCursorPosition.Horizontal); VerticalMovement = ABS(Pointer->MouseDownPosition.Vertical - mCursorPosition.Vertical); - - if ((HorizontalMovement <= MINIMAL_MOVEMENT) - && (VerticalMovement <= MINIMAL_MOVEMENT)) { + // + // CHANGE: Apple did not scale by UIScale. + // + if ((HorizontalMovement <= mUiScale * MINIMAL_MOVEMENT) + && (VerticalMovement <= mUiScale * MINIMAL_MOVEMENT)) { EventType = APPLE_EVENT_TYPE_MOUSE_CLICK; if ((Pointer->PreviousClickEventType == APPLE_EVENT_TYPE_MOUSE_CLICK) @@ -606,8 +608,8 @@ InternalHandleButtonInteraction ( HorizontalMovement = ABS(Pointer->ClickPosition.Horizontal - mCursorPosition.Horizontal); VerticalMovement = ABS(Pointer->ClickPosition.Vertical - mCursorPosition.Vertical); - if ((HorizontalMovement <= MINIMAL_MOVEMENT) - && (VerticalMovement <= MINIMAL_MOVEMENT)) { + if ((HorizontalMovement <= mUiScale * MINIMAL_MOVEMENT) + && (VerticalMovement <= mUiScale * MINIMAL_MOVEMENT)) { EventType = APPLE_EVENT_TYPE_MOUSE_DOUBLE_CLICK; } }