diff options
| author | Manolo Gouy <Manolo> | 2016-03-23 17:13:09 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-23 17:13:09 +0000 |
| commit | e3ee1e7b81c9b1a8806b80cd69c66eeccc679bf9 (patch) | |
| tree | 60f70f3960bb65296b42884bed91f8a165ee9f3f /src/Fl_cocoa.mm | |
| parent | 6608db0b0c88fb01a903c47b9e1bbed477766ec2 (diff) | |
Rewrite Fl_Window::size_range_() under the driver model.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11410 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 88199d9bc..5a29767ac 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3036,7 +3036,7 @@ void Fl_X::make(Fl_Window* w) // Install DnD handlers [myview registerForDraggedTypes:[NSArray arrayWithObjects:UTF8_pasteboard_type, NSFilenamesPboardType, nil]]; - if (w->size_range_set) w->size_range_(); + if (w->size_range_set) w->pWindowDriver->size_range(); if ( w->border() || (!w->modal() && !w->tooltip_window()) ) { Fl_Tooltip::enter(0); @@ -3077,12 +3077,13 @@ void Fl_X::make(Fl_Window* w) /* * Tell the OS what window sizes we want to allow */ -void Fl_Window::size_range_() { +void Fl_Cocoa_Window_Driver::size_range() { int bx, by, bt; get_window_frame_sizes(bx, by, bt); - size_range_set = 1; - NSSize minSize = NSMakeSize(minw, minh + bt); - NSSize maxSize = NSMakeSize(maxw?maxw:32000, maxh?maxh + bt:32000); + Fl_Window_Driver::size_range(); + NSSize minSize = NSMakeSize(minw(), minh() + bt); + NSSize maxSize = NSMakeSize(maxw() ? maxw():32000, maxh() ? maxh() + bt:32000); + Fl_X *i = Fl_X::i(pWindow); if (i && i->xid) { [i->xid setMinSize:minSize]; [i->xid setMaxSize:maxSize]; |