diff options
| author | fvogel <fvogelnew1@free.fr> | 2022-06-15 06:05:46 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2022-06-15 06:05:46 (GMT) |
| commit | 20414a9b1346f970a3d55194c5f2513d47a6bb08 (patch) | |
| tree | 8fdd4501e92dec027b8310245ac08ee6349b8a52 | |
| parent | ccfe81a419cd941ea07efa755f6b216547c7d3b5 (diff) | |
| download | tk-20414a9b1346f970a3d55194c5f2513d47a6bb08.zip tk-20414a9b1346f970a3d55194c5f2513d47a6bb08.tar.gz tk-20414a9b1346f970a3d55194c5f2513d47a6bb08.tar.bz2 | |
Simplify frame-3.10 and frame-12.3 (the latter is failing sporadically). This is no stability fix though.
| -rw-r--r-- | tests/frame.test | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/tests/frame.test b/tests/frame.test index 63bb187..2acf869 100644 --- a/tests/frame.test +++ b/tests/frame.test @@ -673,19 +673,11 @@ test frame-3.10 {TkCreateFrame procedure, -use option} -constraints { } -body { toplevel .t -container 1 -width 300 -height 120 wm geometry .t +0+0 - if {[tk windowingsystem] eq "aqua"} { - update idletasks - } else { - update - } + updateWidgets option add *x.use [winfo id .t] toplevel .x -width 140 -height 300 -bg green - if {[tk windowingsystem] eq "aqua"} { - update idletasks - } else { - tkwait visibility .x - update - } + tkwait visibility .x + updateWidgets list [expr {[winfo rootx .x] - [winfo rootx .t]}] \ [expr {[winfo rooty .x] - [winfo rooty .t]}] \ [winfo width .t] [winfo height .t] @@ -1169,19 +1161,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 - } + updateWidgets 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 - } + updateWidgets set h2 [font metrics myfont -linespace] set y2 [winfo y .f.f] expr {($h2 - $h1) - ($y2 - $y1)} |