summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-18 13:15:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-11-18 13:15:42 (GMT)
commite977448fa4e13fe1d4f2c0c6772ab1006e3f94a3 (patch)
treededb903cbf1a662634ff85b7a9bddca70886e171
parent7e6a8b0a249f5e75c648e579156e3b30c8866eeb (diff)
parent690db09c143da53cd3adebb52f8eac12db5c767c (diff)
downloadtk-e977448fa4e13fe1d4f2c0c6772ab1006e3f94a3.zip
tk-e977448fa4e13fe1d4f2c0c6772ab1006e3f94a3.tar.gz
tk-e977448fa4e13fe1d4f2c0c6772ab1006e3f94a3.tar.bz2
Fix [f60c54bec69540893fccfd2b4021b91b4321cf61|f60c54bec6]: Combobox does not retrieve -postoffset value from correct style
-rw-r--r--library/ttk/combobox.tcl3
-rw-r--r--tests/ttk/combobox.test9
2 files changed, 11 insertions, 1 deletions
diff --git a/library/ttk/combobox.tcl b/library/ttk/combobox.tcl
index 03821a2..6ceccef 100644
--- a/library/ttk/combobox.tcl
+++ b/library/ttk/combobox.tcl
@@ -368,7 +368,8 @@ proc ttk::combobox::PlacePopdown {cb popdown} {
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}]
+ 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
}
diff --git a/tests/ttk/combobox.test b/tests/ttk/combobox.test
index 43f3cf1..35ded6c 100644
--- a/tests/ttk/combobox.test
+++ b/tests/ttk/combobox.test
@@ -45,6 +45,15 @@ test combobox-2.4 "current -- value not in list" -body {
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...