Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-06-06 16:46:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

A subwindow in an Fl_Tile did not work well after recent addition of support for true Mac OS X subwindows.

Browse Source 
The tile demo program runs correctly again.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10453 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy
2014-11-13 13:57:27 +00:00
parent b0c7a6f509
commit d2072c818c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Fl_cocoa.mm
+6 -3
View File
@@ -2609,9 +2609,11 @@ static void set_subwindow_frame(Fl_Window *w) { // maps a subwindow at its corre
// subwindow coordinates are in screen units from bottom just like all windows
rp.origin = NSMakePoint(rp.origin.x + w->x(), rp.origin.y + parent->h() - w->y() - w->h());
rp.size = NSMakeSize(w->w(), w->h());
[xid setFrame:rp display:YES];
[pxid addChildWindow:xid ordered:NSWindowAbove]; // needs OS X 10.2
[xid orderWindow:NSWindowAbove relativeTo:[pxid windowNumber]]; // necessary under 10.3
if (!NSEqualRects(rp, [xid frame])) {
[xid setFrame:rp display:YES];
[pxid addChildWindow:xid ordered:NSWindowAbove]; // needs OS X 10.2
[xid orderWindow:NSWindowAbove relativeTo:[pxid windowNumber]]; // necessary under 10.3
}
}
/*
@@ -2911,6 +2913,7 @@ void Fl_Window::resize(int X,int Y,int W,int H) {
size_range(W, H, W, H);
}
Fl_Group::resize(X,Y,W,H);
if (parent()) set_subwindow_frame(this);
// make sure that subwindows of this window don't leak out of their parent window
NSArray *children = [fl_xid(this) childWindows]; // 10.2
NSEnumerator *enumerator = [children objectEnumerator];