Import Tk 8.6.11
This commit is contained in:
@@ -12,13 +12,13 @@ namespace eval ttk::spinbox { }
|
||||
ttk::copyBindings TEntry TSpinbox
|
||||
|
||||
bind TSpinbox <Motion> { ttk::spinbox::Motion %W %x %y }
|
||||
bind TSpinbox <ButtonPress-1> { ttk::spinbox::Press %W %x %y }
|
||||
bind TSpinbox <Button-1> { ttk::spinbox::Press %W %x %y }
|
||||
bind TSpinbox <ButtonRelease-1> { ttk::spinbox::Release %W }
|
||||
bind TSpinbox <Double-Button-1> { ttk::spinbox::DoubleClick %W %x %y }
|
||||
bind TSpinbox <Triple-Button-1> {} ;# disable TEntry triple-click
|
||||
|
||||
bind TSpinbox <KeyPress-Up> { event generate %W <<Increment>> }
|
||||
bind TSpinbox <KeyPress-Down> { event generate %W <<Decrement>> }
|
||||
bind TSpinbox <Up> { event generate %W <<Increment>> }
|
||||
bind TSpinbox <Down> { event generate %W <<Decrement>> }
|
||||
|
||||
bind TSpinbox <<Increment>> { ttk::spinbox::Spin %W +1 }
|
||||
bind TSpinbox <<Decrement>> { ttk::spinbox::Spin %W -1 }
|
||||
@@ -29,12 +29,14 @@ ttk::bindMouseWheel TSpinbox [list ttk::spinbox::MouseWheel %W]
|
||||
# Sets cursor.
|
||||
#
|
||||
proc ttk::spinbox::Motion {w x y} {
|
||||
variable State
|
||||
ttk::saveCursor $w State(userConfCursor) [ttk::cursor text]
|
||||
if { [$w identify $x $y] eq "textarea"
|
||||
&& [$w instate {!readonly !disabled}]
|
||||
&& [$w instate {!readonly !disabled}]
|
||||
} {
|
||||
ttk::setCursor $w text
|
||||
} else {
|
||||
ttk::setCursor $w ""
|
||||
ttk::setCursor $w $State(userConfCursor)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,16 +46,16 @@ proc ttk::spinbox::Press {w x y} {
|
||||
if {[$w instate disabled]} { return }
|
||||
focus $w
|
||||
switch -glob -- [$w identify $x $y] {
|
||||
*textarea { ttk::entry::Press $w $x }
|
||||
*textarea { ttk::entry::Press $w $x }
|
||||
*rightarrow -
|
||||
*uparrow { ttk::Repeatedly event generate $w <<Increment>> }
|
||||
*uparrow { ttk::Repeatedly event generate $w <<Increment>> }
|
||||
*leftarrow -
|
||||
*downarrow { ttk::Repeatedly event generate $w <<Decrement>> }
|
||||
*downarrow { ttk::Repeatedly event generate $w <<Decrement>> }
|
||||
*spinbutton {
|
||||
if {$y * 2 >= [winfo height $w]} {
|
||||
set event <<Decrement>>
|
||||
set event <<Decrement>>
|
||||
} else {
|
||||
set event <<Increment>>
|
||||
set event <<Increment>>
|
||||
}
|
||||
ttk::Repeatedly event generate $w $event
|
||||
}
|
||||
@@ -67,7 +69,7 @@ proc ttk::spinbox::DoubleClick {w x y} {
|
||||
if {[$w instate disabled]} { return }
|
||||
|
||||
switch -glob -- [$w identify $x $y] {
|
||||
*textarea { SelectAll $w }
|
||||
*textarea { SelectAll $w }
|
||||
* { Press $w $x $y }
|
||||
}
|
||||
}
|
||||
@@ -133,16 +135,31 @@ proc ttk::spinbox::Adjust {w v min max} {
|
||||
# -from, -to, and -increment.
|
||||
#
|
||||
proc ttk::spinbox::Spin {w dir} {
|
||||
variable State
|
||||
|
||||
if {[$w instate disabled]} { return }
|
||||
set nvalues [llength [set values [$w cget -values]]]
|
||||
set value [$w get]
|
||||
if {$nvalues} {
|
||||
set current [lsearch -exact $values $value]
|
||||
set index [Adjust $w [expr {$current + $dir}] 0 [expr {$nvalues - 1}]]
|
||||
$w set [lindex $values $index]
|
||||
|
||||
if {![info exists State($w,values.length)]} {
|
||||
set State($w,values.index) -1
|
||||
set State($w,values.last) {}
|
||||
}
|
||||
set State($w,values) [$w cget -values]
|
||||
set State($w,values.length) [llength $State($w,values)]
|
||||
|
||||
if {$State($w,values.length) > 0} {
|
||||
set value [$w get]
|
||||
set current $State($w,values.index)
|
||||
if {$value ne $State($w,values.last)} {
|
||||
set current [lsearch -exact $State($w,values) $value]
|
||||
if {$current < 0} {set current -1}
|
||||
}
|
||||
set State($w,values.index) [Adjust $w [expr {$current + $dir}] 0 \
|
||||
[expr {$State($w,values.length) - 1}]]
|
||||
set State($w,values.last) [lindex $State($w,values) $State($w,values.index)]
|
||||
$w set $State($w,values.last)
|
||||
} else {
|
||||
if {[catch {
|
||||
set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
|
||||
if {[catch {
|
||||
set v [expr {[scan [$w get] %f] + $dir * [$w cget -increment]}]
|
||||
}]} {
|
||||
set v [$w cget -from]
|
||||
}
|
||||
@@ -160,7 +177,7 @@ proc ttk::spinbox::FormatValue {w val} {
|
||||
if {$fmt eq ""} {
|
||||
# Try to guess a suitable -format based on -increment.
|
||||
set delta [expr {abs([$w cget -increment])}]
|
||||
if {0 < $delta && $delta < 1} {
|
||||
if {0 < $delta && $delta < 1} {
|
||||
# NB: This guesses wrong if -increment has more than 1
|
||||
# significant digit itself, e.g., -increment 0.25
|
||||
set nsd [expr {int(ceil(-log10($delta)))}]
|
||||
|
||||
Reference in New Issue
Block a user