mirror of
https://github.com/fltk/fltk.git
synced 2026-05-30 04:55:29 +08:00
macOS: remove duplicated code.
This commit is contained in:
+2
-13
@@ -1265,19 +1265,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
|
|||||||
Fl_Window *window = [nsw getFl_Window];
|
Fl_Window *window = [nsw getFl_Window];
|
||||||
|
|
||||||
int X, Y, W, H;
|
int X, Y, W, H;
|
||||||
float s = Fl::screen_driver()->scale(window->screen_num());
|
if (Fl_Window::is_a_rescale() || Fl_Cocoa_Window_Driver::driver(window)->through_resize()) {
|
||||||
if (Fl_Window::is_a_rescale()) {
|
|
||||||
if (window->parent()) {
|
|
||||||
X = window->x();
|
|
||||||
Y = window->y();
|
|
||||||
} else {
|
|
||||||
// Recalculate the FLTK position from the current Cocoa position applying
|
|
||||||
// the new scale, so the window stays at its current position after scaling.
|
|
||||||
CocoatoFLTK(window, X, Y);
|
|
||||||
}
|
|
||||||
W = window->w();
|
|
||||||
H = window->h();
|
|
||||||
} else if (Fl_Cocoa_Window_Driver::driver(window)->through_resize()) {
|
|
||||||
if (window->parent()) {
|
if (window->parent()) {
|
||||||
X = window->x();
|
X = window->x();
|
||||||
Y = window->y();
|
Y = window->y();
|
||||||
@@ -1290,6 +1278,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
|
|||||||
} else {
|
} else {
|
||||||
CocoatoFLTK(window, X, Y);
|
CocoatoFLTK(window, X, Y);
|
||||||
NSRect r = [view frame];
|
NSRect r = [view frame];
|
||||||
|
float s = Fl::screen_driver()->scale(window->screen_num());
|
||||||
W = (int)lround(r.size.width/s);
|
W = (int)lround(r.size.width/s);
|
||||||
H = (int)lround(r.size.height/s);
|
H = (int)lround(r.size.height/s);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user