diff options
| author | culler <culler> | 2020-10-07 22:15:15 (GMT) |
|---|---|---|
| committer | culler <culler> | 2020-10-07 22:15:15 (GMT) |
| commit | c34280047302f7c8eb273255f5ea197cd6e59c9d (patch) | |
| tree | 187d8439632b2af3f6bea9f30274f822946b7e05 /macosx/tkMacOSXSubwindows.c | |
| parent | c89a70630558480627dcf1fc39b14106b7eee218 (diff) | |
| parent | f13aa6c87705fae7111ee41caa62cddd5b99f3e0 (diff) | |
| download | tk-c34280047302f7c8eb273255f5ea197cd6e59c9d.zip tk-c34280047302f7c8eb273255f5ea197cd6e59c9d.tar.gz tk-c34280047302f7c8eb273255f5ea197cd6e59c9d.tar.bz2 | |
Merge trunk
Diffstat (limited to 'macosx/tkMacOSXSubwindows.c')
| -rw-r--r-- | macosx/tkMacOSXSubwindows.c | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/macosx/tkMacOSXSubwindows.c b/macosx/tkMacOSXSubwindows.c index 5697443..53c231c 100644 --- a/macosx/tkMacOSXSubwindows.c +++ b/macosx/tkMacOSXSubwindows.c @@ -14,6 +14,7 @@ #include "tkMacOSXPrivate.h" #include "tkMacOSXDebug.h" #include "tkMacOSXWm.h" +#include "tkMacOSXConstants.h" /* #ifdef TK_MAC_DEBUG @@ -357,15 +358,19 @@ XResizeWindow( display->request++; if (Tk_IsTopLevel(macWin->winPtr) && !Tk_IsEmbedded(macWin->winPtr)) { - NSWindow *w = macWin->winPtr->wmInfoPtr->window; + TKWindow *w = (TKWindow *)macWin->winPtr->wmInfoPtr->window; if (w) { - NSRect r = [w contentRectForFrameRect:[w frame]]; - - r.origin.y += r.size.height - height; - r.size.width = width; - r.size.height = height; - [w setFrame:[w frameRectForContentRect:r] display:YES]; + if ([w styleMask] & NSFullScreenWindowMask) { + [w tkLayoutChanged]; + } else { + NSRect r = [w contentRectForFrameRect:[w frame]]; + + r.origin.y += r.size.height - height; + r.size.width = width; + r.size.height = height; + [w setFrame:[w frameRectForContentRect:r] display:NO]; + } } } else { MoveResizeWindow(macWin); @@ -421,7 +426,7 @@ XMoveResizeWindow( X + XOff, TkMacOSXZeroScreenHeight() - Y - YOff - Height, Width, Height); - [w setFrame:[w frameRectForContentRect:r] display:YES]; + [w setFrame:[w frameRectForContentRect:r] display:NO]; } } else { MoveResizeWindow(macWin); |