summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2018-11-23 09:47:08 +0000
committerManolo Gouy <Manolo>2018-11-23 09:47:08 +0000
commit3be39b03b4ab0326dda89a91b5bd4717eb0a7ce5 (patch)
tree58bdb83d1a46430f8bf628eba08824cf2dd68fca
parent97c0c6a0243dfc5596abccc243044af6eeaf40b4 (diff)
MacOS: further support of scenarios mixing miniaturize/deminiaturize/change screen configurations.
Test scenario: - use 2-screen configuration, one retina, one non-retina as main screen - put subwindow-containing window on retina - miniaturize window - close retina screen - de-miniaturize window The subwindow was wrong without this change. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13131 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
-rw-r--r--src/Fl_cocoa.mm2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 915677038..330f23e64 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1222,6 +1222,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;
if (fabs([[nsw contentView] frame].size.height - window->h() * fl_graphics_driver->scale()) > 5.) {
// the contentView, but not the window frame, is resized. This happens with tabbed windows.
[self windowDidResize:notif];