AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new methods to transform coordinates expressed in Cocoa's bounds rect to

Browse Source 
and from those expressed in wxWidgets fashion.  Use these new methods to do
the translation for mouse events, child window position, and dirty rects.
Also improve DoMoveWindow to only dirty the old and new rects of the
control within its superview rather than the entire superview.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott 2005-01-12 20:51:35 +00:00
parent 7d098cfdd7
commit 34c9978dac
2 changed files with 89 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wx/cocoa/window.h
View File

@ -111,6 +111,12 @@ protected:
// NOTE: position is 10,10 to make it "obvious" that it's out of place
return NSMakeRect(10.0,10.0,WidthDefault(size.x),HeightDefault(size.y));
}
// These functions translate NSPoint or NSRect between the coordinate
// system of Cocoa's boudns rect and wx's coordinate system.
NSPoint CocoaTransformBoundsToWx(NSPoint pointBounds);
NSRect CocoaTransformBoundsToWx(NSRect rectBounds);
NSPoint CocoaTransformWxToBounds(NSPoint pointWx);
NSRect CocoaTransformWxToBounds(NSRect rectWx);
#endif //def __OBJC__
// ------------------------------------------------------------------------
// Implementation

99
src/cocoa/window.mm
View File

@ -344,6 +344,62 @@ WX_NSView wxWindowCocoa::GetNSViewForHiding() const
: m_cocoaNSView;
}
NSPoint wxWindowCocoa::CocoaTransformBoundsToWx(NSPoint pointBounds)
{
// TODO: Handle scrolling offset
wxCHECK_MSG(GetNSView(), pointBounds, wxT("Need to have a Cocoa view to do translation"));
if([GetNSView() isFlipped])
return pointBounds;
NSRect ourBounds = [GetNSView() bounds];
return NSMakePoint
( pointBounds.x
, ourBounds.size.height - pointBounds.y
);
}
NSRect wxWindowCocoa::CocoaTransformBoundsToWx(NSRect rectBounds)
{
// TODO: Handle scrolling offset
wxCHECK_MSG(GetNSView(), rectBounds, wxT("Need to have a Cocoa view to do translation"));
if([GetNSView() isFlipped])
return rectBounds;
NSRect ourBounds = [GetNSView() bounds];
return NSMakeRect
( rectBounds.origin.x
, ourBounds.size.height - (rectBounds.origin.y + rectBounds.size.height)
, rectBounds.size.width
, rectBounds.size.height
);
}
NSPoint wxWindowCocoa::CocoaTransformWxToBounds(NSPoint pointWx)
{
// TODO: Handle scrolling offset
wxCHECK_MSG(GetNSView(), pointWx, wxT("Need to have a Cocoa view to do translation"));
if([GetNSView() isFlipped])
return pointWx;
NSRect ourBounds = [GetNSView() bounds];
return NSMakePoint
( pointWx.x
, ourBounds.size.height - pointWx.y
);
}
NSRect wxWindowCocoa::CocoaTransformWxToBounds(NSRect rectWx)
{
// TODO: Handle scrolling offset
wxCHECK_MSG(GetNSView(), rectWx, wxT("Need to have a Cocoa view to do translation"));
if([GetNSView() isFlipped])
return rectWx;
NSRect ourBounds = [GetNSView() bounds];
return NSMakeRect
( rectWx.origin.x
, ourBounds.size.height - (rectWx.origin.y + rectWx.size.height)
, rectWx.size.width
, rectWx.size.height
);
}
bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
{
wxLogTrace(wxTRACE_COCOA,wxT("Cocoa_drawRect"));
@ -363,7 +419,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; i<countRects; i++)
{
transformedRects[i] = CocoaTransformBoundsToWx(rects[i]);
}
m_updateRegion = wxRegion(transformedRects,countRects);
free(transformedRects);
wxPaintEvent event(m_windowId);
event.SetEventObject(this);
@ -375,11 +438,14 @@ bool wxWindowCocoa::Cocoa_drawRect(const NSRect &rect)
void wxWindowCocoa::InitMouseEvent(wxMouseEvent& event, WX_NSEvent cocoaEvent)
{
wxASSERT_MSG([m_cocoaNSView window]==[cocoaEvent window],wxT("Mouse event for different NSWindow"));
// Mouse events happen at the NSWindow level so we need to convert
// into our bounds coordinates then convert to wx coordinates.
NSPoint cocoaPoint = [m_cocoaNSView convertPoint:[(NSEvent*)cocoaEvent locationInWindow] fromView:nil];
NSRect cocoaRect = [m_cocoaNSView frame];
NSPoint pointWx = CocoaTransformBoundsToWx(cocoaPoint);
// FIXME: Should we be adjusting for client area origin?
const wxPoint &clientorigin = GetClientAreaOrigin();
event.m_x = (wxCoord)cocoaPoint.x - clientorigin.x;
event.m_y = (wxCoord)(cocoaRect.size.height - cocoaPoint.y) - clientorigin.y;
event.m_x = (wxCoord)pointWx.x - clientorigin.x;
event.m_y = (wxCoord)pointWx.y - clientorigin.y;
event.m_shiftDown = [cocoaEvent modifierFlags] & NSShiftKeyMask;
event.m_controlDown = [cocoaEvent modifierFlags] & NSControlKeyMask;
@ -632,13 +698,15 @@ void wxWindowCocoa::DoMoveWindow(int x, int y, int width, int height)
NSView *nsview = GetNSViewForSuperview();
NSView *superview = [nsview superview];
wxCHECK_RET(superview,wxT("NSView does not have a superview"));
NSRect parentRect = [superview bounds];
NSRect cocoaRect = NSMakeRect(x,parentRect.size.height-(y+height),width,height);
[nsview setFrame: cocoaRect];
wxCHECK_RET(GetParent(), wxT("Window can only be placed correctly when it has a parent"));
NSRect oldFrameRect = [nsview frame];
NSRect newFrameRect = GetParent()->CocoaTransformWxToBounds(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)
@ -646,14 +714,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
@ -662,6 +730,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];
}
@ -679,15 +748,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);
}