From 3b7649bdc1d6357c2c3145879d0720493e784622 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 8 Jan 2016 15:40:47 +0000 Subject: ..... horizontal scrollbar too --- library/scrlbar.tcl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl index 7b1c3af..b1658ac 100644 --- a/library/scrlbar.tcl +++ b/library/scrlbar.tcl @@ -153,7 +153,10 @@ switch [tk windowingsystem] { } "x11" { bind Scrollbar { - tk::ScrollByUnits %W v [expr {- (%D/120)}] + tk::ScrollByUnits %W v [expr {- (%D /120 )}] + } + bind Scrollbar { + tk::ScrollByUnits %W h [expr {- (%D /120 )}] } bind Scrollbar <4> {tk::ScrollByUnits %W v -5} bind Scrollbar <5> {tk::ScrollByUnits %W v 5} -- cgit v0.12 From a74bdffd9369f2ed76ba90a5497e5a4f7b2475cd Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 8 Jan 2016 22:10:59 +0000 Subject: Make test-case and binding equal for win32 and x11. Test-case doesn't pass yet --- library/scrlbar.tcl | 4 ++-- tests/scrollbar.test | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/library/scrlbar.tcl b/library/scrlbar.tcl index b1658ac..b7be014 100644 --- a/library/scrlbar.tcl +++ b/library/scrlbar.tcl @@ -153,10 +153,10 @@ switch [tk windowingsystem] { } "x11" { bind Scrollbar { - tk::ScrollByUnits %W v [expr {- (%D /120 )}] + tk::ScrollByUnits %W v [expr {- (%D /120 ) * 4}] } bind Scrollbar { - tk::ScrollByUnits %W h [expr {- (%D /120 )}] + tk::ScrollByUnits %W h [expr {- (%D /120 ) * 4}] } bind Scrollbar <4> {tk::ScrollByUnits %W v -5} bind Scrollbar <5> {tk::ScrollByUnits %W v 5} diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 8f92c93..6717deb 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -632,7 +632,7 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} { list [winfo children .] [interp hidden] } [list {} $l] -test scrollbar-10.1 { event on scrollbar} -constraints win -setup { +test scrollbar-10.1 { event on scrollbar} -setup { destroy .t .s } -body { pack [text .t -yscrollcommand {.s set}] -side left @@ -647,6 +647,21 @@ test scrollbar-10.1 { event on scrollbar} -constraints win -setup { destroy .t .s } -result {2.0} +test scrollbar-10.2 { event on scrollbar} -setup { + destroy .t .s +} -body { + pack [text .t -xscrollcommand {.s set}] -side top + for {set i 1} {$i < 100} {incr i} {.t insert end "Char $i "} + pack [scrollbar .s -command {.t xview} -orient horizontal] -fill x -expand 1 -side top + update + focus -force .s + event generate .s -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} -- cgit v0.12 From ac43dfdc269f9ea9dc7448bc815aba5f28a96efc Mon Sep 17 00:00:00 2001 From: fvogel Date: Sat, 9 Jan 2016 00:03:22 +0000 Subject: Test cases scrollbar-10.[12] pass --- tests/scrollbar.test | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 6717deb..85ee8b9 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -632,7 +632,7 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} { list [winfo children .] [interp hidden] } [list {} $l] -test scrollbar-10.1 { event on scrollbar} -setup { +test scrollbar-10.1 { event on scrollbar} -constraints {win unix} -setup { destroy .t .s } -body { pack [text .t -yscrollcommand {.s set}] -side left @@ -645,12 +645,12 @@ test scrollbar-10.1 { event on scrollbar} -setup { .t index @0,0 } -cleanup { destroy .t .s -} -result {2.0} +} -result {5.0} -test scrollbar-10.2 { event on scrollbar} -setup { +test scrollbar-10.2 { event on scrollbar} -constraints {win unix} -setup { destroy .t .s } -body { - pack [text .t -xscrollcommand {.s set}] -side top + pack [text .t -xscrollcommand {.s set} -wrap none] -side top for {set i 1} {$i < 100} {incr i} {.t insert end "Char $i "} pack [scrollbar .s -command {.t xview} -orient horizontal] -fill x -expand 1 -side top update @@ -660,7 +660,7 @@ test scrollbar-10.2 { event on scrollbar} -setup { .t index @0,0 } -cleanup { destroy .t .s -} -result {2.0} +} -result {1.4} catch {destroy .s} catch {destroy .t} -- cgit v0.12 From 631b7815fb57704361344f53cad675ffdbbd6d13 Mon Sep 17 00:00:00 2001 From: fvogel Date: Sat, 9 Jan 2016 00:06:49 +0000 Subject: Fixed test constraints --- tests/scrollbar.test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scrollbar.test b/tests/scrollbar.test index 85ee8b9..3b16821 100644 --- a/tests/scrollbar.test +++ b/tests/scrollbar.test @@ -632,7 +632,7 @@ test scrollbar-9.1 {scrollbar widget vs hidden commands} { list [winfo children .] [interp hidden] } [list {} $l] -test scrollbar-10.1 { event on scrollbar} -constraints {win unix} -setup { +test scrollbar-10.1 { event on scrollbar} -constraints {win|unix} -setup { destroy .t .s } -body { pack [text .t -yscrollcommand {.s set}] -side left @@ -647,7 +647,7 @@ test scrollbar-10.1 { event on scrollbar} -constraints {win unix} -s destroy .t .s } -result {5.0} -test scrollbar-10.2 { event on scrollbar} -constraints {win unix} -setup { +test scrollbar-10.2 { event on scrollbar} -constraints {win|unix} -setup { destroy .t .s } -body { pack [text .t -xscrollcommand {.s set} -wrap none] -side top -- cgit v0.12