diff options
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/salwtype.hxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/commandevent.cxx | 6 | ||||
| -rw-r--r-- | vcl/source/window/winproc.cxx | 16 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtkframe.cxx | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/vcl/inc/salwtype.hxx b/vcl/inc/salwtype.hxx index 14883f43975f..9e43d16d4135 100644 --- a/vcl/inc/salwtype.hxx +++ b/vcl/inc/salwtype.hxx @@ -90,7 +90,7 @@ enum class SalEvent { StartReconversion, QueryCharPosition, GestureSwipe, - LongPress, + GestureLongPress, ExternalGesture, GesturePan, GestureZoom, @@ -252,7 +252,7 @@ struct SalGestureSwipeEvent tools::Long mnY; }; -struct SalLongPressEvent +struct SalGestureLongPressEvent { tools::Long mnX; tools::Long mnY; diff --git a/vcl/source/window/commandevent.cxx b/vcl/source/window/commandevent.cxx index ef3f753ac6a5..83c21826e7c3 100644 --- a/vcl/source/window/commandevent.cxx +++ b/vcl/source/window/commandevent.cxx @@ -179,10 +179,10 @@ const CommandGestureSwipeData* CommandEvent::GetGestureSwipeData() const return nullptr; } -const CommandLongPressData* CommandEvent::GetLongPressData() const +const CommandGestureLongPressData* CommandEvent::GetLongPressData() const { - if( mnCommand == CommandEventId::LongPress ) - return static_cast<const CommandLongPressData*>(mpData); + if( mnCommand == CommandEventId::GestureLongPress ) + return static_cast<const CommandGestureLongPressData*>(mpData); else return nullptr; } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index e0af8255e514..45182d0a09f8 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -1769,27 +1769,27 @@ static bool ImplHandleSwipe(vcl::Window *pWindow, const SalGestureSwipeEvent& rE namespace { -class HandleLongPressEvent : public HandleGestureEvent +class HandleGestureLongPressEvent : public HandleGestureEvent { private: - CommandLongPressData m_aLongPressData; + CommandGestureLongPressData m_aLongPressData; public: - HandleLongPressEvent(vcl::Window *pWindow, const SalLongPressEvent& rEvt) + HandleGestureLongPressEvent(vcl::Window *pWindow, const SalGestureLongPressEvent& rEvt) : HandleGestureEvent(pWindow, Point(rEvt.mnX, rEvt.mnY)), m_aLongPressData(rEvt.mnX, rEvt.mnY) { } virtual bool CallCommand(vcl::Window *pWindow, const Point &/*rMousePos*/) override { - return ImplCallCommand(pWindow, CommandEventId::LongPress, &m_aLongPressData); + return ImplCallCommand(pWindow, CommandEventId::GestureLongPress, &m_aLongPressData); } }; } -static bool ImplHandleLongPress(vcl::Window *pWindow, const SalLongPressEvent& rEvt) +static bool ImplHandleLongPress(vcl::Window *pWindow, const SalGestureLongPressEvent& rEvt) { - HandleLongPressEvent aHandler(pWindow, rEvt); + HandleGestureLongPressEvent aHandler(pWindow, rEvt); return aHandler.HandleEvent(); } @@ -2907,8 +2907,8 @@ bool ImplWindowFrameProc( vcl::Window* _pWindow, SalEvent nEvent, const void* pE bRet = ImplHandleSwipe(pWindow, *static_cast<const SalGestureSwipeEvent*>(pEvent)); break; - case SalEvent::LongPress: - bRet = ImplHandleLongPress(pWindow, *static_cast<const SalLongPressEvent*>(pEvent)); + case SalEvent::GestureLongPress: + bRet = ImplHandleLongPress(pWindow, *static_cast<const SalGestureLongPressEvent*>(pEvent)); break; case SalEvent::ExternalGesture: diff --git a/vcl/unx/gtk3/gtkframe.cxx b/vcl/unx/gtk3/gtkframe.cxx index 3992672b479b..ab66866f8811 100644 --- a/vcl/unx/gtk3/gtkframe.cxx +++ b/vcl/unx/gtk3/gtkframe.cxx @@ -3443,12 +3443,12 @@ void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdou GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture)); if (gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y)) { - SalLongPressEvent aEvent; + SalGestureLongPressEvent aEvent; aEvent.mnX = x; aEvent.mnY = y; GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - pThis->CallCallbackExc(SalEvent::LongPress, &aEvent); + pThis->CallCallbackExc(SalEvent::GestureLongPress, &aEvent); } } |