diff options
author | culler <culler> | 2024-05-28 17:16:06 (GMT) |
---|---|---|
committer | culler <culler> | 2024-05-28 17:16:06 (GMT) |
commit | 57db60b89310192b0a8cf1fd78046eb622352839 (patch) | |
tree | 5c9ecd7a51f7d7a7bce299a64056f99ab025cc69 /tests | |
parent | d0863507871c8c40fefb431343082e2607e2f583 (diff) | |
parent | 4e2ce7f2c671d121814f282afbe74d72a6bdd217 (diff) | |
download | tk-57db60b89310192b0a8cf1fd78046eb622352839.zip tk-57db60b89310192b0a8cf1fd78046eb622352839.tar.gz tk-57db60b89310192b0a8cf1fd78046eb622352839.tar.bz2 |
Merge with macOS-14-CI so we can test on macOS 14; remove SendEnterLeaveForMap which seems to be unneeded.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/font.test | 13 | ||||
-rw-r--r-- | tests/unixWm.test | 1 |
2 files changed, 8 insertions, 6 deletions
diff --git a/tests/font.test b/tests/font.test index 4a264f8..5ceb1ee 100644 --- a/tests/font.test +++ b/tests/font.test @@ -2427,15 +2427,15 @@ test font-47.2 {Bug 3049518 - Canvas} -body { set twidth [font measure MyFont $text] set theight [font metrics MyFont -linespace] set circid [$c create polygon \ - 15 15 \ - [expr {15 + $twidth}] 15 \ - [expr {15 + $twidth}] [expr {15 + $theight}] \ - 15 [expr {15 + $theight}] \ - -width 1 -joinstyle round -smooth true -fill {} -outline blue] + 15 15 \ + [expr {15 + $twidth}] 15 \ + [expr {15 + $twidth}] [expr {15 + $theight}] \ + 15 [expr {15 + $theight}] \ + -width 1 -joinstyle round -smooth true -fill {} -outline blue] pack $c -fill both -expand 1 -side top update - # Lamda test functions + # Lambda test functions set circle_text {{w user_data text circ} { if {[winfo class $w] ne "Canvas"} { puts "Wrong widget type: $w" @@ -2461,6 +2461,7 @@ test font-47.2 {Bug 3049518 - Canvas} -body { apply $circle_text $c FontChanged $textid $circid update bind $c <<TkWorldChanged>> [list apply $circle_text %W %d $textid $circid] + update idletasks # Begin test: set results {} diff --git a/tests/unixWm.test b/tests/unixWm.test index 65561d4..e286027 100644 --- a/tests/unixWm.test +++ b/tests/unixWm.test @@ -105,6 +105,7 @@ foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" { set i 1 foreach geom "+20+80 +80+$Y0 +0+$Y0 -0-0 +0-0 -0+$Y0 -10-5 -10+$Y5 +10-5" { test unixWm-3.$i {moving window while iconified} unix { + update wm iconify .t update idletasks wm geom .t $geom |