mirror of
https://github.com/fltk/fltk.git
synced 2026-06-06 00:22:42 +08:00
Mac OS: removed some code that was duplicated by checkSubwindowFrame run later.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10950 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
@@ -3091,18 +3091,6 @@ void Fl_X::make(Fl_Window* w)
|
|||||||
// next 2 statements so a subwindow doesn't leak out of its parent window
|
// next 2 statements so a subwindow doesn't leak out of its parent window
|
||||||
[cw setOpaque:NO];
|
[cw setOpaque:NO];
|
||||||
[cw setBackgroundColor:[NSColor clearColor]]; // transparent background color
|
[cw setBackgroundColor:[NSColor clearColor]]; // transparent background color
|
||||||
CGRect srect = CGRectMake(0, 0, w->w(), w->h());
|
|
||||||
Fl_Window *parent, *from = w;
|
|
||||||
int fromx = 0, fromy = 0;
|
|
||||||
while ((parent = from->window()) != NULL) {
|
|
||||||
fromx -= from->x(); // parent origin in w's coordinates
|
|
||||||
fromy -= from->y();
|
|
||||||
srect = CGRectIntersection(CGRectMake(fromx, fromy, parent->w(), parent->h()), srect);
|
|
||||||
from = parent;
|
|
||||||
}
|
|
||||||
if (!CGRectEqualToRect(srect, CGRectMake(0, 0, w->w(), w->h()))) { // if subwindow extends outside its parent windows
|
|
||||||
x->subRect(new CGRect(srect));
|
|
||||||
}
|
|
||||||
[cw setSubwindowFrame];
|
[cw setSubwindowFrame];
|
||||||
// needed if top window was first displayed miniaturized
|
// needed if top window was first displayed miniaturized
|
||||||
FLWindow *pxid = fl_xid(w->top_window());
|
FLWindow *pxid = fl_xid(w->top_window());
|
||||||
|
|||||||
Reference in New Issue
Block a user