mirror of https://github.com/fltk/fltk
Mac OS: correct window redraws after a window was created in iconized form.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10564 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
parent
d88bf15117
commit
522fc17d31
|
@ -1337,6 +1337,7 @@ static FLWindowDelegate *flwindowdelegate_instance = nil;
|
||||||
Fl_Window *window = [nsw getFl_Window];
|
Fl_Window *window = [nsw getFl_Window];
|
||||||
Fl::handle(FL_SHOW, window);
|
Fl::handle(FL_SHOW, window);
|
||||||
update_e_xy_and_e_xy_root(nsw);
|
update_e_xy_and_e_xy_root(nsw);
|
||||||
|
Fl_X::i(window)->wait_for_expose = 0; // necessary when window was created miniaturized
|
||||||
Fl::flush(); // process redraws set by FL_SHOW
|
Fl::flush(); // process redraws set by FL_SHOW
|
||||||
fl_unlock_function();
|
fl_unlock_function();
|
||||||
}
|
}
|
||||||
|
@ -2990,7 +2991,6 @@ void Fl_X::make(Fl_Window* w)
|
||||||
|
|
||||||
w->set_visible();
|
w->set_visible();
|
||||||
if ( w->border() || (!w->modal() && !w->tooltip_window()) ) Fl::handle(FL_FOCUS, w);
|
if ( w->border() || (!w->modal() && !w->tooltip_window()) ) Fl::handle(FL_FOCUS, w);
|
||||||
if (!w->parent()) Fl::first_window(w);
|
|
||||||
[cw setDelegate:[FLWindowDelegate singleInstance]];
|
[cw setDelegate:[FLWindowDelegate singleInstance]];
|
||||||
if (fl_show_iconic) {
|
if (fl_show_iconic) {
|
||||||
fl_show_iconic = 0;
|
fl_show_iconic = 0;
|
||||||
|
@ -3119,6 +3119,7 @@ void Fl_Window::show() {
|
||||||
[i->xid makeKeyAndOrderFront:nil];
|
[i->xid makeKeyAndOrderFront:nil];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else set_visible();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue