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

Use wxPoint instead of (x,y) pair in wxPanGestureEvent

Browse Source 
Using higher level objects makes the code generating and using this
event shorter and more clear.
This commit is contained in:
Vadim Zeitlin
2017-11-21 17:34:51 +01:00
parent db71a10b29
commit bb2887930f
7 changed files with 70 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1525,13 +1525,12 @@ void wxWidgetCocoaImpl::PanGestureEvent(NSPanGestureRecognizer* panGestureRecogn
nspoint = [panGestureRecognizer translationInView:m_osxView];
pt = wxFromNSPoint(m_osxView, nspoint);
static int s_lastLocationX = 0, s_lastLocationY = 0;
static wxPoint s_lastLocation;
if ( gestureState == NSGestureRecognizerStateBegan )
{
wxevent.SetGestureStart();
s_lastLocationX = 0;
s_lastLocationY = 0;
s_lastLocation = wxPoint(0, 0);
}
if ( gestureState == NSGestureRecognizerStateEnded )
@@ -1539,12 +1538,10 @@ void wxWidgetCocoaImpl::PanGestureEvent(NSPanGestureRecognizer* panGestureRecogn
wxevent.SetGestureEnd();
}
// Set the offsets
wxevent.SetDeltaX(pt.x - s_lastLocationX);
wxevent.SetDeltaY(pt.y - s_lastLocationY);
// Set the offset
wxevent.SetDelta(pt - s_lastLocation);
s_lastLocationX = pt.x;
s_lastLocationY = pt.y;
s_lastLocation = pt;
GetWXPeer()->HandleWindowEvent(wxevent);
}