From 99dc946340de705f198fd0a3ccbf5bebec731377 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Sun, 9 Mar 2025 11:47:35 +0100 Subject: [PATCH] macOS: Don't constrainFrameRect for child frames * src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]): Don't do anything for child frames. (cherry picked from commit ba20f73d8e0173a37fbdd2efe72a7a3b0d62dfa5) --- src/nsterm.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nsterm.m b/src/nsterm.m index f6fd43a1889..46bb3f5dd7a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -9790,6 +9790,13 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c) NSTRACE ("[EmacsWindow constrainFrameRect:" NSTRACE_FMT_RECT " toScreen:]", NSTRACE_ARG_RECT (frameRect)); + /* Don't do anything for child frames because that leads to weird + child frame placement in some cases involving Dock placement and + Dock Hiding. */ + struct frame *f = ((EmacsView *) [self delegate])->emacsframe; + if (FRAME_PARENT_FRAME (f)) + return frameRect; + #ifdef NS_IMPL_COCOA #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1090 // If separate spaces is on, it is like each screen is independent. There is -- 2.39.5