diff options
| -rw-r--r-- | macosx/tkMacOSXWm.c | 4 | ||||
| -rw-r--r-- | tests/place.test | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/macosx/tkMacOSXWm.c b/macosx/tkMacOSXWm.c index abaf152..3af2ff5 100644 --- a/macosx/tkMacOSXWm.c +++ b/macosx/tkMacOSXWm.c @@ -6870,7 +6870,6 @@ ApplyWindowAttributeFlagChanges( b |= (NSWindowCollectionBehaviorCanJoinAllSpaces | NSWindowCollectionBehaviorFullScreenAuxiliary); } else { - NSSize screenSize = [[macWindow screen] frame].size; b |= NSWindowCollectionBehaviorFullScreenPrimary; /* @@ -6881,7 +6880,10 @@ ApplyWindowAttributeFlagChanges( * to the screen size. (For 10.11 and up, only) */ if ([NSApp macOSVersion] > 101000) { +#if !(MAC_OS_X_VERSION_MAX_ALLOWED > 101000) + NSSize screenSize = [[macWindow screen] frame].size; [macWindow setMaxFullScreenContentSize:screenSize]; +#endif } } } diff --git a/tests/place.test b/tests/place.test index 62e0ed2..56ddde4 100644 --- a/tests/place.test +++ b/tests/place.test @@ -264,34 +264,35 @@ test place-8.1 {MasterStructureProc, mapping and unmapping slaves} -setup { place forget .t.f } -body { place .t.f2 -relx 1.0 -rely 1.0 -anchor sw - update + update idletasks set result [winfo ismapped .t.f2] wm iconify .t - update + update idletasks lappend result [winfo ismapped .t.f2] place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw - update + update idletasks lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2] wm deiconify .t - update + update idletasks lappend result [winfo ismapped .t.f2] } -result {1 0 40 30 0 1} test place-8.2 {MasterStructureProc, mapping and unmapping slaves} -setup { place forget .t.f2 place forget .t.f + update idletasks } -body { place .t.f -x 0 -y 0 -width 200 -height 100 place .t.f2 -in .t.f -relx 1.0 -rely 1.0 -anchor sw -width 50 -height 20 - update + update idletasks set result [winfo ismapped .t.f2] wm iconify .t - update + update idletasks lappend result [winfo ismapped .t.f2] place .t.f2 -x 40 -y 30 -relx 0 -rely 0 -anchor nw - update + update idletasks lappend result [winfo x .t.f2] [winfo y .t.f2] [winfo ismapped .t.f2] wm deiconify .t - update + update idletasks lappend result [winfo ismapped .t.f2] } -result {1 0 42 32 0 1} destroy .t |