Merge multi-touch gestures event branch
This is a squashed commit of the SOC2017_GESTURES branch from https://github.com/prashantkn94/wxWidgets.git Closes https://github.com/wxWidgets/wxWidgets/pull/551
This commit is contained in:
prashantkn94
committed by
Vadim Zeitlin
Vadim Zeitlin
parent
aef4edb969
commit
261b04b5a3
@@ -3104,6 +3104,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(NSView);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLContext);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSOpenGLPixelFormat);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS( NSPrintInfo );
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSGestureRecognizer);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSPanGestureRecognizer);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSMagnificationGestureRecognizer);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSRotationGestureRecognizer);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSPressGestureRecognizer);
|
||||
DECLARE_WXCOCOA_OBJC_CLASS(NSTouch);
|
||||
#endif /* __WXMAC__ &__DARWIN__ */
|
||||
|
||||
#ifdef __WXMAC__
|
||||
@@ -3267,6 +3273,7 @@ typedef struct _GdkDragContext GdkDragContext;
|
||||
|
||||
#if defined(__WXGTK3__)
|
||||
typedef struct _GdkWindow GdkWindow;
|
||||
typedef struct _GdkEventSequence GdkEventSequence;
|
||||
#elif defined(__WXGTK20__)
|
||||
typedef struct _GdkDrawable GdkWindow;
|
||||
typedef struct _GdkDrawable GdkPixmap;
|
||||
|
||||
@@ -631,6 +631,13 @@ class WXDLLIMPEXP_FWD_CORE wxInitDialogEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxUpdateUIEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxClipboardTextEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxHelpEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxGestureEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPanGestureEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxZoomGestureEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxRotateGestureEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxTwoFingerTapEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxLongPressEvent;
|
||||
class WXDLLIMPEXP_FWD_CORE wxPressAndTapEvent;
|
||||
|
||||
|
||||
// Command events
|
||||
@@ -736,6 +743,14 @@ wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_PAGEDOWN, wxScrollWin
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBTRACK, wxScrollWinEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SCROLLWIN_THUMBRELEASE, wxScrollWinEvent);
|
||||
|
||||
// Gesture events
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_GESTURE_PAN, wxPanGestureEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_GESTURE_ZOOM, wxZoomGestureEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_GESTURE_ROTATE, wxRotateGestureEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_TWO_FINGER_TAP, wxTwoFingerTapEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_LONG_PRESS, wxLongPressEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_PRESS_AND_TAP, wxPressAndTapEvent);
|
||||
|
||||
// System events
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_SIZE, wxSizeEvent);
|
||||
wxDECLARE_EXPORTED_EVENT(WXDLLIMPEXP_CORE, wxEVT_MOVE, wxMoveEvent);
|
||||
@@ -1850,6 +1865,201 @@ private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxSetCursorEvent);
|
||||
};
|
||||
|
||||
// Gesture Event
|
||||
|
||||
const unsigned int wxTwoFingerTimeInterval = 200;
|
||||
|
||||
class WXDLLIMPEXP_CORE wxGestureEvent : public wxEvent
|
||||
{
|
||||
public:
|
||||
wxGestureEvent(wxWindowID winid = 0, wxEventType type = wxEVT_NULL)
|
||||
: wxEvent(winid, type)
|
||||
{
|
||||
m_isStart = false;
|
||||
m_isEnd = false;
|
||||
}
|
||||
|
||||
wxGestureEvent(const wxGestureEvent& event) : wxEvent(event)
|
||||
{
|
||||
m_pos = event.m_pos;
|
||||
m_isStart = event.m_isStart;
|
||||
m_isEnd = event.m_isEnd;
|
||||
}
|
||||
|
||||
const wxPoint& GetPosition() const { return m_pos; }
|
||||
void SetPosition(const wxPoint& pos) { m_pos = pos; }
|
||||
bool IsGestureStart() const { return m_isStart; }
|
||||
void SetGestureStart(bool isStart = true) { m_isStart = isStart; }
|
||||
bool IsGestureEnd() const { return m_isEnd; }
|
||||
void SetGestureEnd(bool isEnd = true) { m_isEnd = isEnd; }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxGestureEvent(*this); }
|
||||
|
||||
protected:
|
||||
wxPoint m_pos;
|
||||
bool m_isStart, m_isEnd;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxGestureEvent);
|
||||
|
||||
};
|
||||
|
||||
// Pan Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_GESTURE_PAN
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxPanGestureEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxPanGestureEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_GESTURE_PAN)
|
||||
{
|
||||
m_deltaX = 0;
|
||||
m_deltaY = 0;
|
||||
}
|
||||
|
||||
wxPanGestureEvent(const wxPanGestureEvent& event) : wxGestureEvent(event)
|
||||
{
|
||||
m_deltaX = event.m_deltaX;
|
||||
m_deltaY = event.m_deltaY;
|
||||
}
|
||||
|
||||
int GetDeltaX() const { return m_deltaX; }
|
||||
void SetDeltaX(int DeltaX) { m_deltaX = DeltaX; }
|
||||
int GetDeltaY() const { return m_deltaY; }
|
||||
void SetDeltaY(int DeltaY) { m_deltaY = DeltaY; }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxPanGestureEvent(*this); }
|
||||
|
||||
private:
|
||||
int m_deltaX, m_deltaY;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPanGestureEvent);
|
||||
};
|
||||
|
||||
// Zoom Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_GESTURE_ZOOM
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxZoomGestureEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxZoomGestureEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_GESTURE_ZOOM)
|
||||
{ m_zoomFactor = 1.0; }
|
||||
|
||||
wxZoomGestureEvent(const wxZoomGestureEvent& event) : wxGestureEvent(event)
|
||||
{
|
||||
m_zoomFactor = event.m_zoomFactor;
|
||||
}
|
||||
|
||||
double GetZoomFactor() const { return m_zoomFactor; }
|
||||
void SetZoomFactor(double zoomFactor) { m_zoomFactor = zoomFactor; }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxZoomGestureEvent(*this); }
|
||||
|
||||
private:
|
||||
double m_zoomFactor;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxZoomGestureEvent);
|
||||
};
|
||||
|
||||
// Rotate Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_GESTURE_ROTATE
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxRotateGestureEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxRotateGestureEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_GESTURE_ROTATE)
|
||||
{ m_rotationAngle = 0.0; }
|
||||
|
||||
wxRotateGestureEvent(const wxRotateGestureEvent& event) : wxGestureEvent(event)
|
||||
{
|
||||
m_rotationAngle = event.m_rotationAngle;
|
||||
}
|
||||
|
||||
double GetRotationAngle() const { return m_rotationAngle; }
|
||||
void SetRotationAngle(double rotationAngle) { m_rotationAngle = rotationAngle; }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxRotateGestureEvent(*this); }
|
||||
|
||||
private:
|
||||
double m_rotationAngle;
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxRotateGestureEvent);
|
||||
};
|
||||
|
||||
// Two Finger Tap Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_TWO_FINGER_TAP
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxTwoFingerTapEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxTwoFingerTapEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_TWO_FINGER_TAP)
|
||||
{ }
|
||||
|
||||
wxTwoFingerTapEvent(const wxTwoFingerTapEvent& event) : wxGestureEvent(event)
|
||||
{ }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxTwoFingerTapEvent(*this); }
|
||||
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxTwoFingerTapEvent);
|
||||
};
|
||||
|
||||
// Long Press Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_LONG_PRESS
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxLongPressEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxLongPressEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_LONG_PRESS)
|
||||
{ }
|
||||
|
||||
wxLongPressEvent(const wxLongPressEvent& event) : wxGestureEvent(event)
|
||||
{ }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxLongPressEvent(*this); }
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxLongPressEvent);
|
||||
};
|
||||
|
||||
// Press And Tap Gesture Event
|
||||
|
||||
/*
|
||||
wxEVT_PRESS_AND_TAP
|
||||
*/
|
||||
|
||||
class WXDLLIMPEXP_CORE wxPressAndTapEvent : public wxGestureEvent
|
||||
{
|
||||
public:
|
||||
wxPressAndTapEvent(wxWindowID winid = 0)
|
||||
: wxGestureEvent(winid, wxEVT_PRESS_AND_TAP)
|
||||
{ }
|
||||
|
||||
wxPressAndTapEvent(const wxPressAndTapEvent& event) : wxGestureEvent(event)
|
||||
{ }
|
||||
|
||||
virtual wxEvent *Clone() const { return new wxPressAndTapEvent(*this); }
|
||||
private:
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxPressAndTapEvent);
|
||||
};
|
||||
|
||||
// Keyboard input event class
|
||||
|
||||
/*
|
||||
@@ -3908,7 +4118,12 @@ typedef void (wxEvtHandler::*wxContextMenuEventFunction)(wxContextMenuEvent&);
|
||||
typedef void (wxEvtHandler::*wxMouseCaptureChangedEventFunction)(wxMouseCaptureChangedEvent&);
|
||||
typedef void (wxEvtHandler::*wxMouseCaptureLostEventFunction)(wxMouseCaptureLostEvent&);
|
||||
typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&);
|
||||
|
||||
typedef void (wxEvtHandler::*wxPanGestureEventFunction)(wxPanGestureEvent&);
|
||||
typedef void (wxEvtHandler::*wxZoomGestureEventFunction)(wxZoomGestureEvent&);
|
||||
typedef void (wxEvtHandler::*wxRotateGestureEventFunction)(wxRotateGestureEvent&);
|
||||
typedef void (wxEvtHandler::*wxTwoFingerTapEventFunction)(wxTwoFingerTapEvent&);
|
||||
typedef void (wxEvtHandler::*wxLongPressEventFunction)(wxLongPressEvent&);
|
||||
typedef void (wxEvtHandler::*wxPressAndTapEventFunction)(wxPressAndTapEvent&);
|
||||
|
||||
#define wxCommandEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxCommandEventFunction, func)
|
||||
@@ -3983,6 +4198,18 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
|
||||
wxEVENT_HANDLER_CAST(wxMouseCaptureLostEventFunction, func)
|
||||
#define wxClipboardTextEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxClipboardTextEventFunction, func)
|
||||
#define wxPanGestureEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxPanGestureEventFunction, func)
|
||||
#define wxZoomGestureEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxZoomGestureEventFunction, func)
|
||||
#define wxRotateGestureEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxRotateGestureEventFunction, func)
|
||||
#define wxTwoFingerTapEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxTwoFingerTapEventFunction, func)
|
||||
#define wxLongPressEventHandler(func) \
|
||||
wxEVENT_HANDLER_CAST(wxLongPressEventFunction, func)
|
||||
#define wxPressAndTapEvent(func) \
|
||||
wxEVENT_HANDLER_CAST(wxPressAndTapEventFunction, func)
|
||||
|
||||
#endif // wxUSE_GUI
|
||||
|
||||
@@ -4317,6 +4544,14 @@ typedef void (wxEvtHandler::*wxClipboardTextEventFunction)(wxClipboardTextEvent&
|
||||
EVT_COMMAND_SCROLL_THUMBRELEASE(winid, func) \
|
||||
EVT_COMMAND_SCROLL_CHANGED(winid, func)
|
||||
|
||||
// Gesture events
|
||||
#define EVT_GESTURE_PAN(winid, func) wx__DECLARE_EVT1(wxEVT_GESTURE_PAN, winid, wxPanGestureEventHandler(func))
|
||||
#define EVT_GESTURE_ZOOM(winid, func) wx__DECLARE_EVT1(wxEVT_GESTURE_ZOOM, winid, wxZoomGestureEventHandler(func))
|
||||
#define EVT_GESTURE_ROTATE(winid, func) wx__DECLARE_EVT1(wxEVT_GESTURE_ROTATE, winid, wxRotateGestureEventHandler(func))
|
||||
#define EVT_TWO_FINGER_TAP(winid, func) wx__DECLARE_EVT1(wxEVT_TWO_FINGER_TAP, winid, wxTwoFingerTapEventHandler(func))
|
||||
#define EVT_LONG_PRESS(winid, func) wx__DECLARE_EVT1(wxEVT_LONG_PRESS, winid, wxLongPressEventHandler(func))
|
||||
#define EVT_PRESS_AND_TAP(winid, func) wx__DECLARE_EVT1(wxEVT_PRESS_AND_TAP, winid, wxPressAndTapEvent(func))
|
||||
|
||||
// Convenience macros for commonly-used commands
|
||||
#define EVT_CHECKBOX(winid, func) wx__DECLARE_EVT1(wxEVT_CHECKBOX, winid, wxCommandEventHandler(func))
|
||||
#define EVT_CHOICE(winid, func) wx__DECLARE_EVT1(wxEVT_CHOICE, winid, wxCommandEventHandler(func))
|
||||
|
||||
@@ -355,6 +355,16 @@ public:
|
||||
|
||||
wxRegion m_nativeUpdateRegion; // not transformed for RTL
|
||||
|
||||
#if defined(__WXGTK3__)
|
||||
unsigned int m_touchCount;
|
||||
unsigned int m_lastTouchTime;
|
||||
int m_gestureState;
|
||||
int m_allowedGestures;
|
||||
int m_activeGestures;
|
||||
wxPoint m_lastTouchPoint;
|
||||
GdkEventSequence* m_touchSequence;
|
||||
#endif
|
||||
|
||||
protected:
|
||||
// implement the base class pure virtuals
|
||||
virtual void DoGetTextExtent(const wxString& string,
|
||||
|
||||
@@ -360,6 +360,12 @@ public:
|
||||
bool HandleMouseWheel(wxMouseWheelAxis axis,
|
||||
WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
bool HandlePanGesture(int x, int y, WXDWORD flags);
|
||||
bool HandleZoomGesture(int x, int y, WXDWORD fingerDistance, WXDWORD flags);
|
||||
bool HandleRotateGesture(int x, int y, WXDWORD angleArgument, WXDWORD flags);
|
||||
bool HandleTwoFingerTap(int x, int y, WXDWORD flags);
|
||||
bool HandlePressAndTap(int x, int y, WXDWORD flags);
|
||||
|
||||
bool HandleChar(WXWPARAM wParam, WXLPARAM lParam);
|
||||
bool HandleKeyDown(WXWPARAM wParam, WXLPARAM lParam);
|
||||
bool HandleKeyUp(WXWPARAM wParam, WXLPARAM lParam);
|
||||
|
||||
@@ -143,6 +143,15 @@ public :
|
||||
void SetupCoordinates(wxCoord &x, wxCoord &y, NSEvent *nsEvent);
|
||||
virtual bool SetupCursor(NSEvent* event);
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
|
||||
virtual void PanGestureEvent(NSPanGestureRecognizer *panGestureRecognizer);
|
||||
virtual void ZoomGestureEvent(NSMagnificationGestureRecognizer *magnificationGestureRecognizer);
|
||||
virtual void RotateGestureEvent(NSRotationGestureRecognizer *rotationGestureRecognizer);
|
||||
virtual void LongPressEvent(NSPressGestureRecognizer *pressGestureRecognizer);
|
||||
virtual void TouchesBegan(NSEvent *event);
|
||||
virtual void TouchesMoved(NSEvent *event);
|
||||
virtual void TouchesEnded(NSEvent *event);
|
||||
#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
|
||||
|
||||
#if !wxOSX_USE_NATIVE_FLIPPED
|
||||
void SetFlipped(bool flipped);
|
||||
@@ -190,6 +199,21 @@ protected:
|
||||
// events, don't resend them
|
||||
bool m_hasEditor;
|
||||
|
||||
#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
|
||||
NSPanGestureRecognizer *m_panGestureRecognizer;
|
||||
NSMagnificationGestureRecognizer *m_magnificationGestureRecognizer;
|
||||
NSRotationGestureRecognizer *m_rotationGestureRecognizer;
|
||||
NSPressGestureRecognizer *m_pressGestureRecognizer;
|
||||
|
||||
int m_allowedGestures;
|
||||
int m_activeGestures;
|
||||
unsigned int m_touchCount;
|
||||
unsigned int m_lastTouchTime;
|
||||
|
||||
// Used to keep track of the touch corresponding to "press" in Press and Tap gesture
|
||||
NSTouch* m_initialTouch;
|
||||
#endif // MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_10
|
||||
|
||||
wxDECLARE_DYNAMIC_CLASS_NO_COPY(wxWidgetCocoaImpl);
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user