summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2016-09-22 13:44:38 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2016-09-22 13:44:38 (GMT)
commita7e24bcc8fe8783f5f4f41f7ed125528c16d185b (patch)
tree558cb3e47ff39a6ca70b9d99d1d4ed5356eb69f6
parent6bbe98fbbffd229a352bccf036bc781272f0be47 (diff)
parent1b5c660e330eddb121d8400dafafffa917beeb46 (diff)
downloadtk-a7e24bcc8fe8783f5f4f41f7ed125528c16d185b.zip
tk-a7e24bcc8fe8783f5f4f41f7ed125528c16d185b.tar.gz
tk-a7e24bcc8fe8783f5f4f41f7ed125528c16d185b.tar.bz2
Merge core-8-5-branch to core-8-6-branch.
-rw-r--r--library/ttk/vistaTheme.tcl2
-rw-r--r--tests/ttk/spinbox.test21
2 files changed, 22 insertions, 1 deletions
diff --git a/library/ttk/vistaTheme.tcl b/library/ttk/vistaTheme.tcl
index 99410cb..3f75f51 100644
--- a/library/ttk/vistaTheme.tcl
+++ b/library/ttk/vistaTheme.tcl
@@ -133,7 +133,7 @@ namespace eval ttk::theme::vista {
Spinbox.background -sticky news -children {
Spinbox.padding -sticky news -children {
Spinbox.innerbg -sticky news -children {
- Spinbox.textarea -expand 1 -sticky {}
+ Spinbox.textarea -expand 1
}
}
Spinbox.uparrow -side top -sticky ens
diff --git a/tests/ttk/spinbox.test b/tests/ttk/spinbox.test
index 32b77af..08f2bda 100644
--- a/tests/ttk/spinbox.test
+++ b/tests/ttk/spinbox.test
@@ -199,6 +199,27 @@ test spinbox-2.4 "current command -- value not in list" -constraints nyi -setup
destroy .sb
} -result -1
+test spinbox-3.0 "textarea should expand to fill widget" -setup {
+ set SBV 5
+ set ::spinbox_test {}
+ ttk::spinbox .sb -from 0 -to 10 -textvariable SBV
+} -body {
+ grid .sb -sticky ew
+ grid columnconfigure . 0 -weight 1
+ bind . <Map> {
+ after idle {
+ wm geometry . "210x80"
+ after 100 {set ::spinbox_test [.sb identify element 5 5]}
+ }
+ bind . <Map> {}
+ }
+ after 500 {set ::spinbox_wait 1} ; vwait ::spinbox_wait
+ set ::spinbox_test
+} -cleanup {
+ destroy .sb
+ unset -nocomplain ::spinbox_test SBV
+} -result {textarea}
+
# nostomp: NB intentional difference between ttk::spinbox and tk::spinbox;
# see also #1439266
#