mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mac OS: a borderless, non-modal window was not created properly.

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10210 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2014-06-26 19:31:38 +00:00
parent 6ade2fde82
commit a8d1251aaa
1 changed files with 5 additions and 6 deletions

11
src/Fl_cocoa.mm

@ -2416,7 +2416,7 @@ void Fl_X::make(Fl_Window* w)
int hp = w->h();
if (w->size_range_set) {
if ( w->minh != w->maxh || w->minw != w->maxw) {
winstyle |= NSResizableWindowMask;
if (w->border()) winstyle |= NSResizableWindowMask;
}
} else {
if (w->resizable()) {
@ -2424,7 +2424,7 @@ void Fl_X::make(Fl_Window* w)
int minw = o->w(); if (minw > 100) minw = 100;
int minh = o->h(); if (minh > 100) minh = 100;
w->size_range(w->w() - o->w() + minw, w->h() - o->h() + minh, 0, 0);
winstyle |= NSResizableWindowMask;
if (w->border()) winstyle |= NSResizableWindowMask;
} else {
w->size_range(w->w(), w->h(), w->w(), w->h());
}
@ -2434,12 +2434,11 @@ void Fl_X::make(Fl_Window* w)
if (!fake_X_wm(w, xwm, ywm, bt, bx, by)) {
// menu windows and tooltips
if (w->modal()||w->tooltip_window()) {
winstyle = NSBorderlessWindowMask;
winlevel = modal_window_level();
} else {
winstyle = NSBorderlessWindowMask;
}
} else if (w->modal()) {
//winstyle = NSBorderlessWindowMask;
}
if (w->modal()) {
winstyle &= ~NSMiniaturizableWindowMask;
// winstyle &= ~(NSResizableWindowMask | NSMiniaturizableWindowMask);
winlevel = modal_window_level();