From de6a876373fde7f44f44fb46a29fcdda1d0793ba Mon Sep 17 00:00:00 2001 From: Alan Third Date: Sun, 13 May 2018 10:33:44 +0100 Subject: [PATCH] Fix redefinition of child frames on NS * src/nsterm.m (x_set_parent_frame): If the NSWindow has an existing parent frame, remove it. --- src/nsterm.m | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/nsterm.m b/src/nsterm.m index c8ae31abc09..df883346dee 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -1958,12 +1958,20 @@ x_set_parent_frame (struct frame *f, Lisp_Object new_value, Lisp_Object old_valu if (p != FRAME_PARENT_FRAME (f)) { - parent = [FRAME_NS_VIEW (p) window]; + block_input (); child = [FRAME_NS_VIEW (f) window]; - block_input (); - [parent addChildWindow: child - ordered: NSWindowAbove]; + if ([child parentWindow] != nil) + [[child parentWindow] removeChildWindow:child]; + + if (!NILP (new_value)) + { + parent = [FRAME_NS_VIEW (p) window]; + + [parent addChildWindow: child + ordered: NSWindowAbove]; + } + unblock_input (); fset_parent_frame (f, new_value); -- 2.39.5