summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-04-15 12:04:52 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2019-04-15 12:04:52 +0200
commit72954f39d801b05789041352bee09c89f655fce4 (patch)
treeda7345539327f1aceb40449e28fd608475a6ebea /src
parent0067952e1af5803a06a9227285dee8313f3020df (diff)
Minor code reordering.
Diffstat (limited to 'src')
-rw-r--r--src/Fl_cocoa.mm6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index ecd3e0cc9..3d108916a 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -1256,7 +1256,6 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
if (!window) return;
fl_lock_function();
NSRect r = [[nsw contentView] frame];
- float s = Fl::screen_driver()->scale(Fl_Window_Driver::driver(window)->screen_num());
int X, Y;
CocoatoFLTK(window, X, Y);
Fl_Cocoa_Window_Driver *d = Fl_Cocoa_Window_Driver::driver(window);
@@ -1272,7 +1271,10 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
d->x(X); d->y(Y);
[nsw recursivelySendToSubwindows:@selector(setSubwindowFrame) applyToSelf:NO];
}
- else window->Fl_Group::resize(X, Y,lround(r.size.width/s), lround(r.size.height/s));
+ else {
+ float s = Fl::screen_driver()->scale(d->screen_num());
+ window->Fl_Group::resize(X, Y, lround(r.size.width/s), lround(r.size.height/s));
+ }
[nsw recursivelySendToSubwindows:@selector(checkSubwindowFrame) applyToSelf:NO];
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_8
if (views_use_CA && !window->as_gl_window()) [(FLViewLayer*)[nsw contentView] reset_layer_data];