X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a82b8141373e1da66c018fbad4e608a4065801b0..461fe6e2559a3096d4985a50ba106f26ed890a1d:/src/cocoa/window.mm diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 80d7260ea0..0b0bb5ede7 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -9,13 +9,26 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/window.h" -#include "wx/log.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/window.h" +#endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" #import #import +#import +#import +#import + +// Turn this on to paint green over the dummy views for debugging +#undef WXCOCOA_FILL_DUMMY_VIEW + +#ifdef WXCOCOA_FILL_DUMMY_VIEW +#import +#endif //def WXCOCOA_FILL_DUMMY_VIEW // ======================================================================== // wxWindowCocoaHider @@ -31,10 +44,50 @@ protected: wxWindowCocoa *m_owner; WX_NSView m_dummyNSView; virtual void Cocoa_FrameChanged(void); +#ifdef WXCOCOA_FILL_DUMMY_VIEW + virtual bool Cocoa_drawRect(const NSRect& rect); +#endif //def WXCOCOA_FILL_DUMMY_VIEW private: wxWindowCocoaHider(); }; +// ======================================================================== +// wxWindowCocoaScroller +// ======================================================================== +class wxWindowCocoaScroller: protected wxCocoaNSView +{ + DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller) +public: + wxWindowCocoaScroller(wxWindow *owner); + virtual ~wxWindowCocoaScroller(); + inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; } + void ClientSizeToSize(int &width, int &height); + void DoGetClientSize(int *x, int *y) const; + void Encapsulate(); + void Unencapsulate(); +protected: + wxWindowCocoa *m_owner; + WX_NSScrollView m_cocoaNSScrollView; + virtual void Cocoa_FrameChanged(void); +private: + wxWindowCocoaScroller(); +}; + +// ======================================================================== +// wxDummyNSView +// ======================================================================== +@interface wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint; +@end + +@implementation wxDummyNSView : NSView +- (NSView *)hitTest:(NSPoint)aPoint +{ + return nil; +} + +@end + // ======================================================================== // wxWindowCocoaHider // ======================================================================== @@ -43,8 +96,9 @@ wxWindowCocoaHider::wxWindowCocoaHider(wxWindow *owner) { wxASSERT(owner); wxASSERT(owner->GetNSViewForHiding()); - m_dummyNSView = [[NSView alloc] + m_dummyNSView = [[wxDummyNSView alloc] initWithFrame:[owner->GetNSViewForHiding() frame]]; + [m_dummyNSView setAutoresizingMask: [owner->GetNSViewForHiding() autoresizingMask]]; AssociateNSView(m_dummyNSView); } @@ -61,6 +115,113 @@ void wxWindowCocoaHider::Cocoa_FrameChanged(void) [m_owner->GetNSViewForHiding() setFrame:[m_dummyNSView frame]]; } +#ifdef WXCOCOA_FILL_DUMMY_VIEW +bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect) +{ + NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:rect]; + [[NSColor greenColor] set]; + [bezpath stroke]; + [bezpath fill]; + return true; +} +#endif //def WXCOCOA_FILL_DUMMY_VIEW + +// ======================================================================== +// wxFlippedNSClipView +// ======================================================================== +@interface wxFlippedNSClipView : NSClipView +- (BOOL)isFlipped; +@end + +@implementation wxFlippedNSClipView : NSClipView +- (BOOL)isFlipped +{ + return YES; +} + +@end + +// ======================================================================== +// wxWindowCocoaScroller +// ======================================================================== +wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner) +: m_owner(owner) +{ + wxASSERT(owner); + wxASSERT(owner->GetNSView()); + m_cocoaNSScrollView = [[NSScrollView alloc] + initWithFrame:[owner->GetNSView() frame]]; + AssociateNSView(m_cocoaNSScrollView); + + /* Replace the default NSClipView with a flipped one. This ensures + scrolling is "pinned" to the top-left instead of bottom-right. */ + NSClipView *flippedClip = [[wxFlippedNSClipView alloc] + initWithFrame: [[m_cocoaNSScrollView contentView] frame]]; + [m_cocoaNSScrollView setContentView:flippedClip]; + [flippedClip release]; + + [m_cocoaNSScrollView setBackgroundColor: [NSColor windowBackgroundColor]]; + [m_cocoaNSScrollView setHasHorizontalScroller: YES]; + [m_cocoaNSScrollView setHasVerticalScroller: YES]; + Encapsulate(); +} + +void wxWindowCocoaScroller::Encapsulate() +{ + // Set the scroll view autoresizingMask to match the current NSView + [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]]; + [m_owner->GetNSView() setAutoresizingMask: NSViewNotSizable]; + // NOTE: replaceSubView will cause m_cocaNSView to be released + // except when it hasn't been added into an NSView hierarchy in which + // case it doesn't need to be and this should work out to a no-op + m_owner->CocoaReplaceView(m_owner->GetNSView(), m_cocoaNSScrollView); + // The NSView is still retained by owner + [m_cocoaNSScrollView setDocumentView: m_owner->GetNSView()]; + // Now it's also retained by the NSScrollView +} + +void wxWindowCocoaScroller::Unencapsulate() +{ + [m_cocoaNSScrollView setDocumentView: nil]; + m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView()); + if(![[m_owner->GetNSView() superview] isFlipped]) + [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin]; +} + +wxWindowCocoaScroller::~wxWindowCocoaScroller() +{ + DisassociateNSView(m_cocoaNSScrollView); + [m_cocoaNSScrollView release]; +} + +void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height) +{ + NSSize frameSize = [NSScrollView + frameSizeForContentSize: NSMakeSize(width,height) + hasHorizontalScroller: [m_cocoaNSScrollView hasHorizontalScroller] + hasVerticalScroller: [m_cocoaNSScrollView hasVerticalScroller] + borderType: [m_cocoaNSScrollView borderType]]; + width = frameSize.width; + height = frameSize.height; +} + +void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const +{ + NSSize nssize = [m_cocoaNSScrollView contentSize]; + if(x) + *x = nssize.width; + if(y) + *y = nssize.height; +} + +void wxWindowCocoaScroller::Cocoa_FrameChanged(void) +{ + wxLogDebug("Cocoa_FrameChanged"); + wxSizeEvent event(m_owner->GetSize(), m_owner->GetId()); + event.SetEventObject(m_owner); + m_owner->GetEventHandler()->ProcessEvent(event); +} + // ======================================================================== // wxWindowCocoa // ======================================================================== @@ -83,8 +244,10 @@ void wxWindowCocoa::Init() m_cocoaNSView = NULL; m_cocoaHider = NULL; + m_cocoaScroller = NULL; m_isBeingDeleted = FALSE; m_isInPaint = FALSE; + m_shouldBeEnabled = true; } // Constructor @@ -98,9 +261,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid, return false; // TODO: create the window - NSRect cocoaRect = NSMakeRect(10,10,20,20); m_cocoaNSView = NULL; - SetNSView([[NSView alloc] initWithFrame: cocoaRect]); + SetNSView([[NSView alloc] initWithFrame: MakeDefaultNSRect(size)]); [m_cocoaNSView release]; if (m_parent) @@ -108,6 +270,7 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid, m_parent->AddChild(this); m_parent->CocoaAddChild(this); } + SetInitialFrameRect(pos,size); return TRUE; } @@ -123,6 +286,7 @@ wxWindow::~wxWindow() CocoaRemoveFromParent(); delete m_cocoaHider; + delete m_cocoaScroller; SetNSView(NULL); } @@ -156,12 +320,16 @@ WX_NSView wxWindowCocoa::GetNSViewForSuperview() const { return m_cocoaHider ? m_cocoaHider->GetNSView() - : m_cocoaNSView; + : m_cocoaScroller + ? m_cocoaScroller->GetNSScrollView() + : m_cocoaNSView; } WX_NSView wxWindowCocoa::GetNSViewForHiding() const { - return m_cocoaNSView; + return m_cocoaScroller + ? m_cocoaScroller->GetNSScrollView() + : m_cocoaNSView; } bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) @@ -286,7 +454,9 @@ void wxWindowCocoa::Cocoa_FrameChanged(void) bool wxWindow::Close(bool force) { - return false; + // The only reason this function exists is that it is virtual and + // wxTopLevelWindowCocoa will override it. + return wxWindowBase::Close(force); } void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView) @@ -294,6 +464,34 @@ void wxWindow::CocoaReplaceView(WX_NSView oldView, WX_NSView newView) [[oldView superview] replaceSubview:oldView with:newView]; } +bool wxWindow::EnableSelfAndChildren(bool enable) +{ + // If the state isn't changing, don't do anything + if(!wxWindowBase::Enable(enable && m_shouldBeEnabled)) + return false; + // Set the state of the Cocoa window + CocoaSetEnabled(m_isEnabled); + // Disable all children or (if enabling) return them to their proper state + for(wxWindowList::compatibility_iterator node = GetChildren().GetFirst(); + node; node = node->GetNext()) + { + node->GetData()->EnableSelfAndChildren(enable); + } + return true; +} + +bool wxWindow::Enable(bool enable) +{ + // Keep track of what the window SHOULD be doing + m_shouldBeEnabled = enable; + // If the parent is disabled for any reason, then this window will be too. + if(!IsTopLevel() && GetParent()) + { + enable = enable && GetParent()->IsEnabled(); + } + return EnableSelfAndChildren(enable); +} + bool wxWindow::Show(bool show) { wxAutoNSAutoreleasePool pool; @@ -380,10 +578,36 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height) NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + NSRect parentRect = [superview bounds]; NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height); [nsview setFrame: cocoaRect]; + // Be sure to redraw the parent to reflect the changed position + [superview setNeedsDisplay:YES]; +} + +void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) +{ + NSView *nsview = GetNSViewForSuperview(); + NSView *superview = [nsview superview]; + wxCHECK_RET(superview,"NSView does not have a superview"); + NSRect parentRect = [superview bounds]; + NSRect frameRect = [nsview frame]; + if(size.x!=-1) + frameRect.size.width = size.x; + if(size.y!=-1) + frameRect.size.height = size.y; + frameRect.origin.x = pos.x; + frameRect.origin.y = parentRect.size.height-(pos.y+frameRect.size.height); + // Tell Cocoa to change the margin between the bottom of the superview + // and the bottom of the control. Keeps the control pinned to the top + // of its superview so that its position in the wxWindows coordinate + // system doesn't change. + if(![superview isFlipped]) + [nsview setAutoresizingMask: NSViewMinYMargin]; + // MUST set the mask before setFrame: which can generate a size event + // and cause a scroller to be added! + [nsview setFrame: frameRect]; } // Get total size @@ -402,7 +626,7 @@ void wxWindow::DoGetPosition(int *x, int *y) const NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,"NSView does not have a superview"); - NSRect parentRect = [superview frame]; + NSRect parentRect = [superview bounds]; NSRect cocoaRect = [nsview frame]; if(x) @@ -453,14 +677,23 @@ void wxWindow::DoClientToScreen(int *x, int *y) const void wxWindow::DoGetClientSize(int *x, int *y) const { wxLogDebug("DoGetClientSize:"); - wxWindowCocoa::DoGetSize(x,y); - // TODO: Actually account for menubar, borders, etc... + if(m_cocoaScroller) + m_cocoaScroller->DoGetClientSize(x,y); + else + wxWindowCocoa::DoGetSize(x,y); } void wxWindow::DoSetClientSize(int width, int height) { wxLogDebug("DoSetClientSize=(%d,%d)",width,height); - // TODO + if(m_cocoaScroller) + m_cocoaScroller->ClientSizeToSize(width,height); + CocoaSetWxWindowSize(width,height); +} + +void wxWindow::CocoaSetWxWindowSize(int width, int height) +{ + wxWindowCocoa::DoSetSize(-1,-1,width,height,wxSIZE_USE_EXISTING); } int wxWindow::GetCharHeight() const @@ -512,10 +745,19 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) // TODO } +void wxWindow::CocoaCreateNSScrollView() +{ + if(!m_cocoaScroller) + { + m_cocoaScroller = new wxWindowCocoaScroller(this); + } +} + // New function that will replace some of the above. void wxWindow::SetScrollbar(int orient, int pos, int thumbVisible, int range, bool refresh) { + CocoaCreateNSScrollView(); // TODO } @@ -525,31 +767,58 @@ void wxWindow::ScrollWindow(int dx, int dy, const wxRect *rect) // TODO } +void wxWindow::DoSetVirtualSize( int x, int y ) +{ + wxWindowBase::DoSetVirtualSize(x,y); + CocoaCreateNSScrollView(); + [m_cocoaNSView setFrameSize:NSMakeSize(m_virtualSize.x,m_virtualSize.y)]; +} + bool wxWindow::SetFont(const wxFont& font) { // TODO return TRUE; } -void wxWindow::Clear() +static int CocoaRaiseWindowCompareFunction(id first, id second, void *target) { - // TODO + // first should be ordered higher + if(first==target) + return NSOrderedDescending; + // second should be ordered higher + if(second==target) + return NSOrderedAscending; + return NSOrderedSame; } // Raise the window to the top of the Z order void wxWindow::Raise() { - wxAutoNSAutoreleasePool pool; +// wxAutoNSAutoreleasePool pool; NSView *nsview = GetNSViewForSuperview(); - NSView *superview = [nsview superview]; - [nsview removeFromSuperview]; - [superview addSubview:nsview]; + [[nsview superview] sortSubviewsUsingFunction: + CocoaRaiseWindowCompareFunction + context: nsview]; +} + +static int CocoaLowerWindowCompareFunction(id first, id second, void *target) +{ + // first should be ordered lower + if(first==target) + return NSOrderedAscending; + // second should be ordered lower + if(second==target) + return NSOrderedDescending; + return NSOrderedSame; } // Lower the window to the bottom of the Z order void wxWindow::Lower() { - // TODO + NSView *nsview = GetNSViewForSuperview(); + [[nsview superview] sortSubviewsUsingFunction: + CocoaLowerWindowCompareFunction + context: nsview]; } bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y)