Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | add tk upstream changes |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
73923862b9d89b66a42b721875500c60 |
| User & Date: | chw 2016-11-19 15:03:21 |
Context
|
2016-11-19
| ||
| 16:49 | two additions to TIP#302 sample implementation check-in: cd1e683bbd user: chw tags: trunk | |
| 15:03 | add tk upstream changes check-in: 73923862b9 user: chw tags: trunk | |
| 12:09 | fixes in tkchat regarding certificate validation errors check-in: 1a360640ec user: chw tags: trunk | |
Changes
Changes to jni/sdl2tk/library/ttk/combobox.tcl.
364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 |
# @@@TODO: factor with menubutton::PostPosition
#
proc ttk::combobox::PlacePopdown {cb popdown} {
set x [winfo rootx $cb]
set y [winfo rooty $cb]
set w [winfo width $cb]
set h [winfo height $cb]
set postoffset [ttk::style lookup TCombobox -postoffset {} {0 0 0 0}]
foreach var {x y w h} delta $postoffset {
incr $var $delta
}
set H [winfo reqheight $popdown]
if {$y + $h + $H > [winfo screenheight $popdown]} {
set Y [expr {$y - $H}]
|
> | |
364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 |
# @@@TODO: factor with menubutton::PostPosition
#
proc ttk::combobox::PlacePopdown {cb popdown} {
set x [winfo rootx $cb]
set y [winfo rooty $cb]
set w [winfo width $cb]
set h [winfo height $cb]
set style [$cb cget -style]
set postoffset [ttk::style lookup $style -postoffset {} {0 0 0 0}]
foreach var {x y w h} delta $postoffset {
incr $var $delta
}
set H [winfo reqheight $popdown]
if {$y + $h + $H > [winfo screenheight $popdown]} {
set Y [expr {$y - $H}]
|
Changes to jni/sdl2tk/tests/ttk/combobox.test.
41 42 43 44 45 46 47 48 49 50 51 52 53 54 |
test combobox-2.4 "current -- value not in list" -body {
.cb set "z"
.cb current
} -result -1
test combobox-2.end "Cleanup" -body { destroy .cb }
test combobox-1890211 "ComboboxSelected event after listbox unposted" -body {
# whitebox test...
pack [ttk::combobox .cb -values [list a b c]]
set result [list]
bind .cb <<ComboboxSelected>> {
lappend result Event [winfo ismapped .cb.popdown] [.cb get]
|
> > > > > > > > > |
41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 |
test combobox-2.4 "current -- value not in list" -body {
.cb set "z"
.cb current
} -result -1
test combobox-2.end "Cleanup" -body { destroy .cb }
test combobox-3 "Read postoffset value dynamically from current style" -constraints unix -body {
ttk::combobox .cb -values [list a b c] -style "DerivedStyle.TCombobox"
pack .cb -expand true -fill both
ttk::style configure DerivedStyle.TCombobox -postoffset [list 25 0 0 0]
ttk::combobox::Post .cb
winfo x .cb.popdown
} -result 25 -cleanup {
destroy .cb
}
test combobox-1890211 "ComboboxSelected event after listbox unposted" -body {
# whitebox test...
pack [ttk::combobox .cb -values [list a b c]]
set result [list]
bind .cb <<ComboboxSelected>> {
lappend result Event [winfo ismapped .cb.popdown] [.cb get]
|