New attempt at fixing bug [1927212fff]. (rebased against Tk 8.6)

2 files changed, 18 insertions, 0 deletions

diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl
index e17442f..7b1c3af 100644
--- a/library/scrlbar.tcl
+++ b/library/scrlbar.tcl
@@ -152,6 +152,9 @@ switch [tk windowingsystem] {
 	}
     }
     "x11" {
+	bind Scrollbar <MouseWheel> {
+	    tk::ScrollByUnits %W v [expr {- (%D/120)}]
+	}
 	bind Scrollbar <4> {tk::ScrollByUnits %W v -5}
 	bind Scrollbar <5> {tk::ScrollByUnits %W v 5}
 	bind Scrollbar <Shift-4> {tk::ScrollByUnits %W h -5}
diff --git a/tests/scrollbar.test b/tests/scrollbar.test
index c6a5a90..8f92c93 100644
--- a/tests/scrollbar.test
+++ b/tests/scrollbar.test
@@ -632,6 +632,21 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} {
     list [winfo children .] [interp hidden]
 } [list {} $l]
 
+test scrollbar-10.1 {<MouseWheel> event on scrollbar} -constraints win -setup {
+    destroy .t .s
+} -body {
+    pack [text .t -yscrollcommand {.s set}] -side left
+    for {set i 1} {$i < 100} {incr i} {.t insert end "Line $i\n"}
+    pack [scrollbar .s -command {.t yview}] -fill y -expand 1 -side left
+    update
+    focus -force .s
+    event generate .s <MouseWheel> -delta -120
+    after 200 {set eventprocessed 1} ; vwait eventprocessed
+    .t index @0,0
+} -cleanup {
+    destroy .t .s
+} -result {2.0}
+
 catch {destroy .s}
 catch {destroy .t}