diff options
author | fvogel <fvogel@noemail.net> | 2016-02-22 17:47:02 (GMT) |
---|---|---|
committer | fvogel <fvogel@noemail.net> | 2016-02-22 17:47:02 (GMT) |
commit | 38cc91d9ca51cf6b9ed28eaf7cb1b7a02ff0b594 (patch) | |
tree | 2fce6cd5c79b35264f602d8c027b17f5b1a58eff /library | |
parent | c9241178ec569c2db76e784eba825ec70e68f627 (diff) | |
download | tk-38cc91d9ca51cf6b9ed28eaf7cb1b7a02ff0b594.zip tk-38cc91d9ca51cf6b9ed28eaf7cb1b7a02ff0b594.tar.gz tk-38cc91d9ca51cf6b9ed28eaf7cb1b7a02ff0b594.tar.bz2 |
Fixed bug [2981253] - spinbox button frozen in case of repeated depressions
FossilOrigin-Name: 159e76856717c1822ca00be113c4faacbfb3a0d5
Diffstat (limited to 'library')
-rw-r--r-- | library/spinbox.tcl | 46 |
1 files changed, 32 insertions, 14 deletions
diff --git a/library/spinbox.tcl b/library/spinbox.tcl index 02584f4..8c287bf 100644 --- a/library/spinbox.tcl +++ b/library/spinbox.tcl @@ -86,10 +86,12 @@ bind Spinbox <B1-Motion> { ::tk::spinbox::Motion %W %x %y } bind Spinbox <Double-1> { + ::tk::spinbox::ArrowPress %W %x %y set tk::Priv(selectMode) word ::tk::spinbox::MouseSelect %W %x sel.first } bind Spinbox <Triple-1> { + ::tk::spinbox::ArrowPress %W %x %y set tk::Priv(selectMode) line ::tk::spinbox::MouseSelect %W %x 0 } @@ -328,6 +330,35 @@ proc ::tk::spinbox::ClosestGap {w x} { incr pos } +# ::tk::spinbox::ArrowPress -- +# This procedure is invoked to handle button-1 presses in buttonup +# or buttondown elements of spinbox widgets. +# +# Arguments: +# w - The spinbox window in which the button was pressed. +# x - The x-coordinate of the button press. +# y - The y-coordinate of the button press. + +proc ::tk::spinbox::ArrowPress {w x y} { + variable ::tk::Priv + + if {[$w cget -state] ne "disabled" && \ + [string match "button*" $Priv(element)]} { + $w selection element $Priv(element) + set Priv(repeated) 0 + set Priv(relief) [$w cget -$Priv(element)relief] + catch {after cancel $Priv(afterId)} + set delay [$w cget -repeatdelay] + if {$delay > 0} { + set Priv(afterId) [after $delay \ + [list ::tk::spinbox::Invoke $w $Priv(element)]] + } + if {[info exists Priv(outsideElement)]} { + unset Priv(outsideElement) + } + } +} + # ::tk::spinbox::ButtonDown -- # This procedure is invoked to handle button-1 presses in spinbox # widgets. It moves the insertion cursor, sets the selection anchor, @@ -351,20 +382,7 @@ proc ::tk::spinbox::ButtonDown {w x y} { switch -exact $Priv(element) { "buttonup" - "buttondown" { - if {"disabled" ne [$w cget -state]} { - $w selection element $Priv(element) - set Priv(repeated) 0 - set Priv(relief) [$w cget -$Priv(element)relief] - catch {after cancel $Priv(afterId)} - set delay [$w cget -repeatdelay] - if {$delay > 0} { - set Priv(afterId) [after $delay \ - [list ::tk::spinbox::Invoke $w $Priv(element)]] - } - if {[info exists Priv(outsideElement)]} { - unset Priv(outsideElement) - } - } + ::tk::spinbox::ArrowPress $w $x $y } "entry" { set Priv(selectMode) char |