From f11a214862eae33d260d1e37c5fa89ea0b4fbd0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gerd=20M=C3=B6llmann?= Date: Wed, 28 May 2025 12:56:42 +0200 Subject: [PATCH] Do child frame shortcut only on Cocoa (bug#78616) * src/nsterm.m ([EmacsWindow constrainFrameRect:toScreen:]): Return early for child frames only on Cocoa. (cherry picked from commit 6279a9e8ef701c2eef8c198b7b26f235bb41f2b0) --- src/nsterm.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nsterm.m b/src/nsterm.m index f822481e2e2..4884a060c3a 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -9801,11 +9801,11 @@ nswindow_orderedIndex_sort (id w1, id w2, void *c) /* Don't do anything for child frames because that leads to weird child frame placement in some cases involving Dock placement and Dock Hiding. */ +#ifdef NS_IMPL_COCOA 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 // no spanning of frames across screens. -- 2.39.5