diff options
| author | dgp <dgp@users.sourceforge.net> | 2019-11-15 20:49:39 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2019-11-15 20:49:39 (GMT) |
| commit | 8e1942061fef5d51c075e2a8591c78ad1a372799 (patch) | |
| tree | 101935d066c0375888e193b59c251eb485009eea /library | |
| parent | 6ccecf53b1fe8f3a1c14d8be0f8f2983f4a43df6 (diff) | |
| parent | 8d9917ac755006729ee15fdd22e399f5861385c2 (diff) | |
| download | tk-8e1942061fef5d51c075e2a8591c78ad1a372799.zip tk-8e1942061fef5d51c075e2a8591c78ad1a372799.tar.gz tk-8e1942061fef5d51c075e2a8591c78ad1a372799.tar.bz2 | |
merge trunk
Diffstat (limited to 'library')
| -rw-r--r-- | library/iconlist.tcl | 6 | ||||
| -rw-r--r-- | library/listbox.tcl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/library/iconlist.tcl b/library/iconlist.tcl index 2095ad6..753f183 100644 --- a/library/iconlist.tcl +++ b/library/iconlist.tcl @@ -447,10 +447,10 @@ package require Tk 8.6 bind $canvas <Shift-B1-Motion> [namespace code {my ShiftMotion1 %x %y}] if {[tk windowingsystem] eq "aqua"} { - bind $canvas <Shift-MouseWheel> [namespace code {my MouseWheel [expr {40 * (%W)}]}] - bind $canvas <Option-Shift-MouseWheel> [namespace code {my MouseWheel [expr {400 * (%W)}]}] + bind $canvas <Shift-MouseWheel> [namespace code {my MouseWheel [expr {40 * (%D)}]}] + bind $canvas <Option-Shift-MouseWheel> [namespace code {my MouseWheel [expr {400 * (%D)}]}] } else { - bind $canvas <Shift-MouseWheel> [namespace code {my MouseWheel %W}] + bind $canvas <Shift-MouseWheel> [namespace code {my MouseWheel %D}] } if {[tk windowingsystem] eq "x11"} { bind $canvas <Shift-4> [namespace code {my MouseWheel 120}] diff --git a/library/listbox.tcl b/library/listbox.tcl index f057151..3802223 100644 --- a/library/listbox.tcl +++ b/library/listbox.tcl @@ -204,14 +204,14 @@ if {[tk windowingsystem] eq "aqua"} { if {%D >= 0} { %W yview scroll [expr {-%D/30}] units } else { - %W yview scroll [expr {29-%D/30}] units + %W yview scroll [expr {(29-%D)/30}] units } } bind Listbox <Shift-MouseWheel> { if {%D >= 0} { %W xview scroll [expr {-%D/30}] units } else { - %W xview scroll [expr {29-%D/30}] units + %W xview scroll [expr {(29-%D)/30}] units } } } |