diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-10-02 21:00:29 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-10-02 21:00:29 (GMT) |
| commit | 252123a50de3f9772249d8f439f60ee0e2a32010 (patch) | |
| tree | f4bcc32af8e81ce04042644a6d27b979f6f62cdd /tests/frame.test | |
| parent | 07be08d69cbabadf2a1b43d4c38995cc739e9abe (diff) | |
| parent | 9549fdb1087bd31f052077f48fcb1cd88d514774 (diff) | |
| download | tk-252123a50de3f9772249d8f439f60ee0e2a32010.zip tk-252123a50de3f9772249d8f439f60ee0e2a32010.tar.gz tk-252123a50de3f9772249d8f439f60ee0e2a32010.tar.bz2 | |
Merge core-8-6-branch that just received changes from unstable_tests branch. This commit stabilizes a lot of tests that could sporadically fail, mainly on macOS. No test results were changed, except for entry-5.7 and spinbox-5.7 which expected results were found to be wrong (these tests passes due to a race condition that is now fixed).
Diffstat (limited to 'tests/frame.test')
| -rw-r--r-- | tests/frame.test | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/frame.test b/tests/frame.test index d2f9d69..f85ebc0 100644 --- a/tests/frame.test +++ b/tests/frame.test @@ -1148,19 +1148,11 @@ test frame-12.3 {FrameWorldChanged procedure} -setup { labelframe .f -font myfont -text Mupp place .f -x 0 -y 0 -width 40 -height 40 pack [frame .f.f] -fill both -expand 1 - if {[tk windowingsystem] eq "aqua"} { - update idletasks - } else { - update - } + update set h1 [font metrics myfont -linespace] set y1 [winfo y .f.f] font configure myfont -size 20 - if {[tk windowingsystem] eq "aqua"} { - update idletasks - } else { - update - } + update set h2 [font metrics myfont -linespace] set y2 [winfo y .f.f] expr {($h2 - $h1) - ($y2 - $y1)} |