gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

macOS: restore correct tabbing/untabbing of windows

Browse Source 
The recent commit "Simpler implementation of Fl_Cocoa_Window_Driver::resize()"
    c66caf5dce
did not take care of tabbing/untabbing of windows.
This is repaired here.
This commit is contained in:
ManoloFLTK 2019-04-22 09:48:15 +02:00
parent 98b4ece33e
commit 602c6ffd8a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Fl_cocoa.mm
View File

@ -3334,6 +3334,7 @@ void Fl_Cocoa_Window_Driver::show() {
void Fl_Cocoa_Window_Driver::resize(int X, int Y, int W, int H) {
if (visible_r()) {
NSPoint pt = FLTKtoCocoa(pWindow, X, Y, H);
FLWindow *xid = fl_xid(pWindow);
if (W != w() || H != h() || is_a_rescale()) {
NSRect r;
float s = Fl::screen_driver()->scale(screen_num());
@ -3342,10 +3343,12 @@ void Fl_Cocoa_Window_Driver::resize(int X, int Y, int W, int H) {
r.origin = pt;
r.size.width = round(W*s);
r.size.height = round(H*s) + bt;
[fl_xid(pWindow) setFrame:r display:YES];
if (NSEqualRects(r, [xid frame])) // occurs with tabbed windows
pWindow->Fl_Group::resize(X, Y, W, H);
else [xid setFrame:r display:YES];
}
else {
[fl_xid(pWindow) setFrameOrigin:pt]; // set cocoa coords to FLTK position
[xid setFrameOrigin:pt]; // set cocoa coords to FLTK position
x(X); y(Y); // useful when frame did not move
}
} else pWindow->Fl_Group::resize(X, Y, W, H);