Proposed fix for [73c5e3ad3]: Two potentially bogus binding scripts f…

…or <TouchpadScroll>
tcltk · Oct 15, 2024 · ce27f02 · ce27f02
1 parent c1b0cc0
commit ce27f02
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/library/listbox.tcl b/library/listbox.tcl
@@ -188,15 +188,14 @@ bind Listbox <Shift-Option-MouseWheel> {
     tk::MouseWheel %W x %D -12.0 units
 }
 bind Listbox <TouchpadScroll> {
-    if {%# %% 5 != 0} {
-	return
-    }
-    lassign [tk::PreciseScrollDeltas %D] tk::Priv(deltaX) tk::Priv(deltaY)
-    if {$tk::Priv(deltaX) != 0} {
-	%W xview scroll [expr {-$tk::Priv(deltaX)}] units
-    }
-    if {$tk::Priv(deltaY) != 0} {
-	%W yview scroll [expr {-$tk::Priv(deltaY)}] units
+    if {%# %% 5 == 0} {
+	lassign [tk::PreciseScrollDeltas %D] tk::Priv(deltaX) tk::Priv(deltaY)
+	if {$tk::Priv(deltaX) != 0} {
+	    %W xview scroll [expr {-$tk::Priv(deltaX)}] units
+	}
+	if {$tk::Priv(deltaY) != 0} {
+	    %W yview scroll [expr {-$tk::Priv(deltaY)}] units
+	}
     }
 }
 

diff --git a/library/ttk/utils.tcl b/library/ttk/utils.tcl
@@ -304,15 +304,14 @@ bind TtkScrollable <Shift-Option-MouseWheel> \
 ## Touchpad scrolling
 #
 bind TtkScrollable <TouchpadScroll> {
-    if {%# %% 5 != 0} {
-	return
-    }
-    lassign [tk::PreciseScrollDeltas %D] tk::Priv(deltaX) tk::Priv(deltaY)
-    if {$tk::Priv(deltaX) != 0} {
-	%W xview scroll [expr {-$tk::Priv(deltaX)}] units
-    }
-    if {$tk::Priv(deltaY) != 0} {
-	%W yview scroll [expr {-$tk::Priv(deltaY)}] units
+    if {%# %% 5 == 0} {
+	lassign [tk::PreciseScrollDeltas %D] tk::Priv(deltaX) tk::Priv(deltaY)
+	if {$tk::Priv(deltaX) != 0} {
+	    %W xview scroll [expr {-$tk::Priv(deltaX)}] units
+	}
+	if {$tk::Priv(deltaY) != 0} {
+	    %W yview scroll [expr {-$tk::Priv(deltaY)}] units
+	}
     }
 }
 #*EOF*