From d3dea8e7622b09c207c3da86f4812f2069653e26 Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Mon, 5 Jul 2021 12:07:18 +0300 Subject: [PATCH 1/2] SYNERGY-1047 Scroll doesn't work in case of macOS is server --- src/lib/platform/OSXScreen.h | 3 --- src/lib/platform/OSXScreen.mm | 11 ++--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/lib/platform/OSXScreen.h b/src/lib/platform/OSXScreen.h index 96dd928a4..62af60833 100644 --- a/src/lib/platform/OSXScreen.h +++ b/src/lib/platform/OSXScreen.h @@ -153,9 +153,6 @@ private: // get the current scroll wheel speed double getScrollSpeed() const; - // get the current scroll wheel speed - double getScrollSpeedFactor() const; - // enable/disable drag handling for buttons 3 and up void enableDragTimer(bool enable); diff --git a/src/lib/platform/OSXScreen.mm b/src/lib/platform/OSXScreen.mm index df29e6d8e..b1d31a2d9 100644 --- a/src/lib/platform/OSXScreen.mm +++ b/src/lib/platform/OSXScreen.mm @@ -1460,9 +1460,8 @@ OSXScreen::mapMacButtonToSynergy(UInt16 macButton) const SInt32 OSXScreen::mapScrollWheelToSynergy(SInt32 x) const { - // return accelerated scrolling but not exponentially scaled as it is - // on the mac. - double d = (1.0 + getScrollSpeed()) * x / getScrollSpeedFactor(); + // return accelerated scrolling + double d = (1.0 + getScrollSpeed()) * x; return static_cast(m_scrollDirection * 120.0 * d); } @@ -1500,12 +1499,6 @@ OSXScreen::getScrollSpeed() const return scaling; } -double -OSXScreen::getScrollSpeedFactor() const -{ - return pow(10.0, getScrollSpeed()); -} - void OSXScreen::enableDragTimer(bool enable) { From ee2692466c0072e78ebb1c064159586e375af83d Mon Sep 17 00:00:00 2001 From: Serhii Hadzhilov Date: Mon, 5 Jul 2021 12:08:17 +0300 Subject: [PATCH 2/2] Update ChangeLog --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 4f35301ca..3f60fb993 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ Bug fixes: - #7015 Fix Windows service not starting up after sleep - #7036 Fix tray icon not changing theme on Big Sur - #7046 Fix MacOS 10.13 build +- #7049 Scroll doesn't work in case of macOS is server Enhancements: - #6998 Remove functionality related to the screen saver synchronisation