Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Extract SetupCoordinates() from wxWidgetCocoaImpl

Browse Source 
Add a free function that can be used from outside wxWidgetCocoaImpl
class too and keep the old method as a trivial wrapper around it.

No changes, this is a pure refactoring.
This commit is contained in:
Vadim Zeitlin
2017-11-21 23:17:11 +01:00
parent a8dfaa569b
commit fd3a3e607b
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/osx/cocoa/window.mm
View File

@@ -528,29 +528,35 @@ bool g_lastButtonWasFakeRight = false ;
- (CGFloat)scrollingDeltaY; - (CGFloat)scrollingDeltaY;
@end @end
void wxWidgetCocoaImpl::SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent* nsEvent) static void
wxSetupCoordinates(NSView* view, wxCoord &x, wxCoord &y, NSEvent* nsEvent)
{ {
NSRect locationInWindow = NSZeroRect; NSRect locationInWindow = NSZeroRect;
locationInWindow.origin = [nsEvent locationInWindow]; locationInWindow.origin = [nsEvent locationInWindow];
// adjust coordinates for the window of the target view // adjust coordinates for the window of the target view
if ( [nsEvent window] != [m_osxView window] ) if ( [nsEvent window] != [view window] )
{ {
if ( [nsEvent window] != nil ) if ( [nsEvent window] != nil )
locationInWindow = [[nsEvent window] convertRectToScreen:locationInWindow]; locationInWindow = [[nsEvent window] convertRectToScreen:locationInWindow];
if ( [m_osxView window] != nil ) if ( [view window] != nil )
locationInWindow = [[m_osxView window] convertRectFromScreen:locationInWindow]; locationInWindow = [[view window] convertRectFromScreen:locationInWindow];
} }
NSPoint locationInView = [m_osxView convertPoint:locationInWindow.origin fromView:nil]; NSPoint locationInView = [view convertPoint:locationInWindow.origin fromView:nil];
wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView ); wxPoint locationInViewWX = wxFromNSPoint( view, locationInView );
x = locationInViewWX.x; x = locationInViewWX.x;
y = locationInViewWX.y; y = locationInViewWX.y;
} }
void wxWidgetCocoaImpl::SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent* nsEvent)
{
wxSetupCoordinates(m_osxView, x, y, nsEvent);
}
void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent ) void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEvent )
{ {
int eventType = [nsEvent type]; int eventType = [nsEvent type];