diff options
author | fvogel <fvogelnew1@free.fr> | 2016-08-19 21:47:34 (GMT) |
---|---|---|
committer | fvogel <fvogelnew1@free.fr> | 2016-08-19 21:47:34 (GMT) |
commit | 6fb89b6069a9896acc6a2dc61f6b4f86e1b4e92c (patch) | |
tree | 4fb32cb63bc52e0b41da7c9327af424ae5901366 | |
parent | 609dfcd8635e481e324af2a0cc0228caf3b7c046 (diff) | |
download | tk-6fb89b6069a9896acc6a2dc61f6b4f86e1b4e92c.zip tk-6fb89b6069a9896acc6a2dc61f6b4f86e1b4e92c.tar.gz tk-6fb89b6069a9896acc6a2dc61f6b4f86e1b4e92c.tar.bz2 |
Fixed [2cf3d6942c] - Test button-5.24 fails. First, use {Helvetica -12} as font for the button text instead of {Helvetica -12 bold} since it's the former and not the latter that is tested against in constraints.tcl regarding the 'font' constraint. Second, don't force -width to a fixed value, otherwise width results can be wrong. Third, adjust the test results in width according to the two previous changes.
-rw-r--r-- | tests/button.test | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/button.test b/tests/button.test index 708fc30..194e877 100644 --- a/tests/button.test +++ b/tests/button.test @@ -3435,15 +3435,15 @@ test button-5.23 {ConfigureButton - -height option} -constraints { test button-5.24 {ConfigureButton - computing geometry} -constraints { fonts } -body { - button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} - .b configure -text "Sample text" -width 10 -height 2 + button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12} + .b configure -text "Sample text" -height 2 pack .b set result "[winfo reqwidth .b] [winfo reqheight .b]" .b configure -bitmap questhead lappend result [winfo reqwidth .b] [winfo reqheight .b] } -cleanup { destroy .b -} -result {104 46 20 12} +} -result {96 46 30 12} test button-5.25 {ConfigureButton - computing geometry} -setup { button .b -borderwidth 2 -highlightthickness 2 -font {Helvetica -12 bold} |