X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e73ae7474c13fe7c412b363d6824700b3654dd4b..b28aeea5cad996158ccc8c63d19aae3786f7b8b2:/src/cocoa/window.mm diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 1e4fd289db..5653b011b7 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -13,6 +13,7 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/window.h" + #include "wx/dc.h" #endif //WX_PRECOMP #include "wx/tooltip.h" @@ -25,6 +26,8 @@ #import #import #import +#import +#import // Turn this on to paint green over the dummy views for debugging #undef WXCOCOA_FILL_DUMMY_VIEW @@ -38,6 +41,58 @@ - (void)getRectsBeingDrawn:(const NSRect **)rects count:(int *)count; @end +NSPoint CocoaTransformNSViewBoundsToWx(NSView *nsview, NSPoint pointBounds) +{ + wxCHECK_MSG(nsview, pointBounds, wxT("Need to have a Cocoa view to do translation")); + if([nsview isFlipped]) + return pointBounds; + NSRect ourBounds = [nsview bounds]; + return NSMakePoint + ( pointBounds.x + , ourBounds.size.height - pointBounds.y + ); +} + +NSRect CocoaTransformNSViewBoundsToWx(NSView *nsview, NSRect rectBounds) +{ + wxCHECK_MSG(nsview, rectBounds, wxT("Need to have a Cocoa view to do translation")); + if([nsview isFlipped]) + return rectBounds; + NSRect ourBounds = [nsview bounds]; + return NSMakeRect + ( rectBounds.origin.x + , ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height) + , rectBounds.size.width + , rectBounds.size.height + ); +} + +NSPoint CocoaTransformNSViewWxToBounds(NSView *nsview, NSPoint pointWx) +{ + wxCHECK_MSG(nsview, pointWx, wxT("Need to have a Cocoa view to do translation")); + if([nsview isFlipped]) + return pointWx; + NSRect ourBounds = [nsview bounds]; + return NSMakePoint + ( pointWx.x + , ourBounds.size.height - pointWx.y + ); +} + +NSRect CocoaTransformNSViewWxToBounds(NSView *nsview, NSRect rectWx) +{ + wxCHECK_MSG(nsview, rectWx, wxT("Need to have a Cocoa view to do translation")); + if([nsview isFlipped]) + return rectWx; + NSRect ourBounds = [nsview bounds]; + return NSMakeRect + ( rectWx.origin.x + , ourBounds.size.height - (rectWx.origin.y + rectWx.size.height) + , rectWx.size.width + , rectWx.size.height + ); +} + // ======================================================================== // wxWindowCocoaHider // ======================================================================== @@ -60,14 +115,14 @@ private: }; // ======================================================================== -// wxWindowCocoaScroller +// wxWindowCocoaScrollView // ======================================================================== -class wxWindowCocoaScroller: protected wxCocoaNSView +class wxWindowCocoaScrollView: protected wxCocoaNSView { - DECLARE_NO_COPY_CLASS(wxWindowCocoaScroller) + DECLARE_NO_COPY_CLASS(wxWindowCocoaScrollView) public: - wxWindowCocoaScroller(wxWindow *owner); - virtual ~wxWindowCocoaScroller(); + wxWindowCocoaScrollView(wxWindow *owner); + virtual ~wxWindowCocoaScrollView(); inline WX_NSScrollView GetNSScrollView() { return m_cocoaNSScrollView; } void ClientSizeToSize(int &width, int &height); void DoGetClientSize(int *x, int *y) const; @@ -78,7 +133,7 @@ protected: WX_NSScrollView m_cocoaNSScrollView; virtual void Cocoa_FrameChanged(void); private: - wxWindowCocoaScroller(); + wxWindowCocoaScrollView(); }; // ======================================================================== @@ -151,9 +206,9 @@ bool wxWindowCocoaHider::Cocoa_drawRect(const NSRect& rect) @end // ======================================================================== -// wxWindowCocoaScroller +// wxWindowCocoaScrollView // ======================================================================== -wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner) +wxWindowCocoaScrollView::wxWindowCocoaScrollView(wxWindow *owner) : m_owner(owner) { wxAutoNSAutoreleasePool pool; @@ -176,7 +231,7 @@ wxWindowCocoaScroller::wxWindowCocoaScroller(wxWindow *owner) Encapsulate(); } -void wxWindowCocoaScroller::Encapsulate() +void wxWindowCocoaScrollView::Encapsulate() { // Set the scroll view autoresizingMask to match the current NSView [m_cocoaNSScrollView setAutoresizingMask: [m_owner->GetNSView() autoresizingMask]]; @@ -190,7 +245,7 @@ void wxWindowCocoaScroller::Encapsulate() // Now it's also retained by the NSScrollView } -void wxWindowCocoaScroller::Unencapsulate() +void wxWindowCocoaScrollView::Unencapsulate() { [m_cocoaNSScrollView setDocumentView: nil]; m_owner->CocoaReplaceView(m_cocoaNSScrollView, m_owner->GetNSView()); @@ -198,13 +253,13 @@ void wxWindowCocoaScroller::Unencapsulate() [m_owner->GetNSView() setAutoresizingMask: NSViewMinYMargin]; } -wxWindowCocoaScroller::~wxWindowCocoaScroller() +wxWindowCocoaScrollView::~wxWindowCocoaScrollView() { DisassociateNSView(m_cocoaNSScrollView); [m_cocoaNSScrollView release]; } -void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height) +void wxWindowCocoaScrollView::ClientSizeToSize(int &width, int &height) { NSSize frameSize = [NSScrollView frameSizeForContentSize: NSMakeSize(width,height) @@ -215,7 +270,7 @@ void wxWindowCocoaScroller::ClientSizeToSize(int &width, int &height) height = (int)frameSize.height; } -void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const +void wxWindowCocoaScrollView::DoGetClientSize(int *x, int *y) const { NSSize nssize = [m_cocoaNSScrollView contentSize]; if(x) @@ -224,7 +279,7 @@ void wxWindowCocoaScroller::DoGetClientSize(int *x, int *y) const *y = (int)nssize.height; } -void wxWindowCocoaScroller::Cocoa_FrameChanged(void) +void wxWindowCocoaScrollView::Cocoa_FrameChanged(void) { wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_FrameChanged")); wxSizeEvent event(m_owner->GetSize(), m_owner->GetId()); @@ -252,7 +307,7 @@ void wxWindowCocoa::Init() { m_cocoaNSView = NULL; m_cocoaHider = NULL; - m_cocoaScroller = NULL; + m_wxCocoaScrollView = NULL; m_isBeingDeleted = FALSE; m_isInPaint = FALSE; m_shouldBeEnabled = true; @@ -294,7 +349,7 @@ wxWindow::~wxWindow() if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview]) CocoaRemoveFromParent(); delete m_cocoaHider; - delete m_cocoaScroller; + delete m_wxCocoaScrollView; if(m_cocoaNSView) SendDestroyEvent(); SetNSView(NULL); @@ -330,18 +385,49 @@ WX_NSView wxWindowCocoa::GetNSViewForSuperview() const { return m_cocoaHider ? m_cocoaHider->GetNSView() - : m_cocoaScroller - ? m_cocoaScroller->GetNSScrollView() + : m_wxCocoaScrollView + ? m_wxCocoaScrollView->GetNSScrollView() : m_cocoaNSView; } WX_NSView wxWindowCocoa::GetNSViewForHiding() const { - return m_cocoaScroller - ? m_cocoaScroller->GetNSScrollView() + return m_wxCocoaScrollView + ? m_wxCocoaScrollView->GetNSScrollView() : m_cocoaNSView; } +NSPoint wxWindowCocoa::CocoaTransformBoundsToWx(NSPoint pointBounds) +{ + // TODO: Handle scrolling offset + return CocoaTransformNSViewBoundsToWx(GetNSView(), pointBounds); +} + +NSRect wxWindowCocoa::CocoaTransformBoundsToWx(NSRect rectBounds) +{ + // TODO: Handle scrolling offset + return CocoaTransformNSViewBoundsToWx(GetNSView(), rectBounds); +} + +NSPoint wxWindowCocoa::CocoaTransformWxToBounds(NSPoint pointWx) +{ + // TODO: Handle scrolling offset + return CocoaTransformNSViewWxToBounds(GetNSView(), pointWx); +} + +NSRect wxWindowCocoa::CocoaTransformWxToBounds(NSRect rectWx) +{ + // TODO: Handle scrolling offset + return CocoaTransformNSViewWxToBounds(GetNSView(), rectWx); +} + +WX_NSAffineTransform wxWindowCocoa::CocoaGetWxToBoundsTransform() +{ + // TODO: Handle scrolling offset + NSAffineTransform *transform = wxDC::CocoaGetWxToBoundsTransform([GetNSView() isFlipped], [GetNSView() bounds].size.height); + return transform; +} + bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) { wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect")); @@ -361,7 +447,14 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect) // Try replacing the larger rectangle with a list of smaller ones: if ([GetNSView() respondsToSelector:@selector(getRectsBeingDrawn:count:)]) [GetNSView() getRectsBeingDrawn:&rects count:&countRects]; - m_updateRegion = wxRegion(rects,countRects); + + NSRect *transformedRects = (NSRect*)malloc(sizeof(NSRect)*countRects); + for(int i=0; iCocoaTransformWxToBounds(NSMakeRect(x,y,width,height)); + [nsview setFrame:newFrameRect]; // Be sure to redraw the parent to reflect the changed position - [superview setNeedsDisplay:YES]; + [superview setNeedsDisplayInRect:oldFrameRect]; + [superview setNeedsDisplayInRect:newFrameRect]; } void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) @@ -644,14 +742,14 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) NSView *nsview = GetNSViewForSuperview(); NSView *superview = [nsview superview]; wxCHECK_RET(superview,wxT("NSView does not have a superview")); - NSRect parentRect = [superview bounds]; + wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent")); 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); + frameRect.origin.y = pos.y; // 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 wxWidgets coordinate @@ -660,6 +758,7 @@ void wxWindowCocoa::SetInitialFrameRect(const wxPoint& pos, const wxSize& size) [nsview setAutoresizingMask: NSViewMinYMargin]; // MUST set the mask before setFrame: which can generate a size event // and cause a scroller to be added! + frameRect = GetParent()->CocoaTransformWxToBounds(frameRect); [nsview setFrame: frameRect]; } @@ -677,15 +776,13 @@ void wxWindow::DoGetSize(int *w, int *h) const void wxWindow::DoGetPosition(int *x, int *y) const { NSView *nsview = GetNSViewForSuperview(); - NSView *superview = [nsview superview]; - wxCHECK_RET(superview,wxT("NSView does not have a superview")); - NSRect parentRect = [superview bounds]; NSRect cocoaRect = [nsview frame]; + NSRect rectWx = GetParent()->CocoaTransformBoundsToWx(cocoaRect); if(x) - *x=(int)cocoaRect.origin.x; + *x=(int)rectWx.origin.x; if(y) - *y=(int)(parentRect.size.height-(cocoaRect.origin.y+cocoaRect.size.height)); + *y=(int)rectWx.origin.y; wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("wxWindow=%p::DoGetPosition = (%d,%d)"),this,(int)cocoaRect.origin.x,(int)cocoaRect.origin.y); } @@ -706,14 +803,8 @@ void wxWindow::Refresh(bool eraseBack, const wxRect *rect) void wxWindow::SetFocus() { -#ifdef __WXDEBUG__ - bool bOK = -#endif - [GetNSView() lockFocusIfCanDraw]; - - //Note that the normal lockFocus works on hidden and minimized windows - //and has no return value - which probably isn't what we want - wxASSERT(bOK); + if([GetNSView() acceptsFirstResponder]) + [[GetNSView() window] makeFirstResponder: GetNSView()]; } void wxWindow::DoCaptureMouse() @@ -742,8 +833,8 @@ void wxWindow::DoClientToScreen(int *x, int *y) const void wxWindow::DoGetClientSize(int *x, int *y) const { wxLogTrace(wxTRACE_COCOA,wxT("DoGetClientSize:")); - if(m_cocoaScroller) - m_cocoaScroller->DoGetClientSize(x,y); + if(m_wxCocoaScrollView) + m_wxCocoaScrollView->DoGetClientSize(x,y); else wxWindowCocoa::DoGetSize(x,y); } @@ -751,8 +842,8 @@ void wxWindow::DoGetClientSize(int *x, int *y) const void wxWindow::DoSetClientSize(int width, int height) { wxLogTrace(wxTRACE_COCOA_Window_Size,wxT("DoSetClientSize=(%d,%d)"),width,height); - if(m_cocoaScroller) - m_cocoaScroller->ClientSizeToSize(width,height); + if(m_wxCocoaScrollView) + m_wxCocoaScrollView->ClientSizeToSize(width,height); CocoaSetWxWindowSize(width,height); } @@ -812,9 +903,9 @@ void wxWindow::SetScrollPos(int orient, int pos, bool refresh) void wxWindow::CocoaCreateNSScrollView() { - if(!m_cocoaScroller) + if(!m_wxCocoaScrollView) { - m_cocoaScroller = new wxWindowCocoaScroller(this); + m_wxCocoaScrollView = new wxWindowCocoaScrollView(this); } } @@ -894,12 +985,30 @@ bool wxWindow::DoPopupMenu(wxMenu *menu, int x, int y) // Get the window with the focus wxWindow *wxWindowBase::DoFindFocus() { - wxCocoaNSView *win = wxCocoaNSView::GetFromCocoa([NSView focusView]); - - if (!win) + // Basically we are somewhat emulating the responder chain here except + // we are only loking for the first responder in the key window or + // upon failing to find one if the main window is different we look + // for the first responder in the main window. + + // Note that the firstResponder doesn't necessarily have to be an + // NSView but wxCocoaNSView::GetFromCocoa() will simply return + // NULL unless it finds its argument in its hash map. + + wxCocoaNSView *win; + + NSWindow *keyWindow = [[NSApplication sharedApplication] keyWindow]; + win = wxCocoaNSView::GetFromCocoa([keyWindow firstResponder]); + if(win) + return win->GetWxWindow(); + + NSWindow *mainWindow = [[NSApplication sharedApplication] keyWindow]; + if(mainWindow == keyWindow) return NULL; - - return win->GetWxWindow(); + win = wxCocoaNSView::GetFromCocoa([mainWindow firstResponder]); + if(win) + return win->GetWxWindow(); + + return NULL; } /* static */ wxWindow *wxWindowBase::GetCapture()