From 50f90a69707e034909651d39a7c7103e0d20a583 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sun, 28 Oct 2018 02:35:02 +0000
Subject: Fix suppport of tabbed windows.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@13085 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 13d00f51a..bd8f25715 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2228,24 +2228,24 @@ static CGContextRef prepare_bitmap_for_layer(int w, int h ) {
   // called if views are layered (but not for GL) : all drawing to window goes through this
   Fl_Window *window = [(FLWindow*)[self window] getFl_Window];
   Fl_Cocoa_Window_Driver *d = Fl_Cocoa_Window_Driver::driver(window);
+  float scale = Fl::screen_driver()->scale(0);
+  NSRect rect = [self frame];
+  if (!window->parent() && window->border() && fabs(rect.size.height - window->h() * scale) > 5. ) {
+    // this happens with tabbed windows
+    window->resize([[self window] frame].origin.x/scale,
+                   (main_screen_height - ([[self window] frame].origin.y + rect.size.height))/scale,
+                   rect.size.width/scale, rect.size.height/scale);
+    [self viewFrameDidChange];
+  }
   if (!layer_gc) { // runs when window is created, resized, changed screen resolution
-    float scale = Fl::screen_driver()->scale(0);
-    NSRect rect = [self frame];
-    if (!window->parent() && window->border() && fabs(rect.size.height - window->h() * scale) > 5. ) {
-      // this happens with tabbed windows
-      window->resize([[self window] frame].origin.x/scale,
-                     (main_screen_height - ([[self window] frame].origin.y + rect.size.height))/scale,
-                     rect.size.width/scale, rect.size.height/scale);
-    }
-    NSRect r = [self frame];
-    layer.bounds = NSRectToCGRect(r);
+    layer.bounds = NSRectToCGRect(rect);
     d->wait_for_expose_value = 0;
     [self did_view_resolution_change];
     if (d->mapped_to_retina()) {
-      r.size.width *= 2; r.size.height *= 2;
+      rect.size.width *= 2; rect.size.height *= 2;
       layer.contentsScale = 2.;
     } else layer.contentsScale = 1.;
-    layer_gc = prepare_bitmap_for_layer(r.size.width, r.size.height);
+    layer_gc = prepare_bitmap_for_layer(rect.size.width, rect.size.height);
     Fl_X *i = Fl_X::i(window);
     if ( i->region ) {
       Fl_Graphics_Driver::default_driver().XDestroyRegion(i->region);
-- 
cgit v1.2.3