diff options
| author | Manolo Gouy <Manolo> | 2014-06-26 19:31:38 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2014-06-26 19:31:38 +0000 |
| commit | a8d1251aaa0abcfa98fd4e00900c0d705fd7e9b2 (patch) | |
| tree | cfa73eede22a183ad6db5b881ac6024f3359edd9 | |
| parent | 6ade2fde827e798a1e6ee0c3b5446b12a57a3cef (diff) | |
Mac OS: a borderless, non-modal window was not created properly.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10210 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl_cocoa.mm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index a82c78039..5de916139 100644 --- a/src/Fl_cocoa.mm +++ b/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(); |