RomanNum3ral
/
Solaar
mirror of https://github.com/pwr-Solaar/Solaar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rules: MouseScroll: Do not consider bool as number 

While the current code path probably won't run into a mistaken scroll
amount as True == 1, let's fix this as my radar beeped when I first saw
this.

Signed-off-by: Rongrong <i@rong.moe>
This commit is contained in:
Rongrong 2026-06-18 00:25:18 +08:00
parent 898349c403
commit 3f03b833b9
No known key found for this signature in database
GPG Key ID: 1C2D45D45AB7FE94
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/logitech_receiver/diversion.py
View File

@ -289,6 +289,10 @@ def signed(bytes_: bytes) -> int:
return int.from_bytes(bytes_, "big", signed=True)
def is_number(n) -> bool:
return not isinstance(n, bool) and isinstance(n, numbers.Number)
def xy_direction(_x, _y):
# normalize x and y
m = math.sqrt((_x * _x) + (_y * _y))
@ -1216,7 +1220,7 @@ class MouseScroll(Action):
def __init__(self, amounts, warn=True):
if len(amounts) == 1 and isinstance(amounts[0], list):
amounts = amounts[0]
if not (len(amounts) == 2 and all([isinstance(a, numbers.Number) for a in amounts])):
if not (len(amounts) == 2 and all([is_number(a) for a in amounts])):
if warn:
logger.warning("rule MouseScroll argument not two numbers %s", amounts)
amounts = [0, 0]
@ -1227,7 +1231,7 @@ class MouseScroll(Action):
def evaluate(self, feature, notification: HIDPPNotification, device, last_result):
amounts = self.amounts
if isinstance(last_result, numbers.Number):
if is_number(last_result):
amounts = [math.floor(last_result * a) for a in self.amounts]
if logger.isEnabledFor(logging.INFO):
logger.info("MouseScroll action: %s %s %s", self.amounts, last_result, amounts)