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

fixing coordinate conversions for captured windows

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64029 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2010-04-18 13:29:06 +00:00
parent 9876e9005c
commit 58110007c7
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -394,14 +394,28 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
{ {
int eventType = [nsEvent type]; int eventType = [nsEvent type];
UInt32 modifiers = [nsEvent modifierFlags] ; UInt32 modifiers = [nsEvent modifierFlags] ;
wxPoint screenMouseLocation = wxFromNSPoint( NULL, [nsEvent locationInWindow]);
NSPoint locationInWindow = [nsEvent locationInWindow];
// adjust coordinates for the window of the target view
if ( [nsEvent window] != [m_osxView window] )
{
if ( [nsEvent window] != nil )
locationInWindow = [[nsEvent window] convertBaseToScreen:locationInWindow];
if ( [m_osxView window] != nil )
locationInWindow = [[m_osxView window] convertScreenToBase:locationInWindow];
}
NSPoint locationInView = [m_osxView convertPoint:locationInWindow fromView:nil];
wxPoint locationInViewWX = wxFromNSPoint( m_osxView, locationInView );
// these parameters are not given for all events // these parameters are not given for all events
UInt32 button = [nsEvent buttonNumber]; UInt32 button = [nsEvent buttonNumber];
UInt32 clickCount = 0; UInt32 clickCount = 0;
wxevent.m_x = screenMouseLocation.x; wxevent.m_x = locationInViewWX.x;
wxevent.m_y = screenMouseLocation.y; wxevent.m_y = locationInViewWX.y;
wxevent.m_shiftDown = modifiers & NSShiftKeyMask; wxevent.m_shiftDown = modifiers & NSShiftKeyMask;
wxevent.m_controlDown = modifiers & NSControlKeyMask; wxevent.m_controlDown = modifiers & NSControlKeyMask;
wxevent.m_altDown = modifiers & NSAlternateKeyMask; wxevent.m_altDown = modifiers & NSAlternateKeyMask;
@@ -1994,13 +2008,8 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event) bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
{ {
NSPoint clickLocation;
clickLocation = [m_osxView convertPoint:[event locationInWindow] fromView:nil];
wxPoint pt = wxFromNSPoint( m_osxView, clickLocation );
wxMouseEvent wxevent(wxEVT_LEFT_DOWN); wxMouseEvent wxevent(wxEVT_LEFT_DOWN);
SetupMouseEvent(wxevent , event) ; SetupMouseEvent(wxevent , event) ;
wxevent.m_x = pt.x;
wxevent.m_y = pt.y;
return GetWXPeer()->HandleWindowEvent(wxevent); return GetWXPeer()->HandleWindowEvent(wxevent);
} }