From 738cce154e45cf8c33d504ad62d19ebb42b1b9ac Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Sun, 28 Apr 2019 18:34:24 +0200
Subject: macOS: further fix to window moving necessary for macOS 10.3

Running the tabs test app with all 6 subwindows shown under 10.3
and moving the window around had 3 subwindows drift away
from their correct position.
---
 src/Fl_cocoa.mm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 9ad29d863..17f979517 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -669,7 +669,7 @@ void Fl_Cocoa_Screen_Driver::breakMacEventLoop()
   if (!NSEqualRects(rp, [self frame])) {
     [self setFrame:rp display:YES];
   }
-  if (![self parentWindow]) {
+  if (![self parentWindow]) { // useful when subwin is first shown, not when moved
     FLWindow *pxid = fl_xid(parent);
     [pxid addChildWindow:self ordered:NSWindowAbove]; // needs OS X 10.2
     [self orderWindow:NSWindowAbove relativeTo:[pxid windowNumber]]; // necessary under 10.3
@@ -1218,8 +1218,8 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
 {
   FLWindow *nsw = (FLWindow*)[notif object];
   Fl_Window *window = [nsw getFl_Window];
-  // don't process move for a subwindow of a miniaturized top window
-  if (window->parent() && [fl_xid(window->top_window()) isMiniaturized]) return;
+  // don't process move for a subwindow
+  if (window->parent() /*&& [fl_xid(window->top_window()) isMiniaturized]*/) return;
   fl_lock_function();
   update_e_xy_and_e_xy_root(nsw);
   // we update 'main_screen_height' here because it's wrong just after screen config changes
-- 
cgit v1.2.3