diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-11 17:10:25 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2019-06-12 23:23:36 +0200 |
| commit | 7bc1418a463fe233fbd8c27dec70a1f92474db65 (patch) | |
| tree | 98dedd599bc5a0f171cb5df4514f719ad1a7cdc5 /vcl | |
| parent | 527ea6c085e22576096a056f2c84e47e96ad69dd (diff) | |
Resolves: rhbz#1719378 wrong signature for GtkGestureLongPress::pressed
Change-Id: Ib4c47189d5c9c89433f0c7de194ebb9777dc7bac
Reviewed-on: https://gerrit.libreoffice.org/73831
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/gtk3/gtk3gtkframe.cxx | 13 |
2 files changed, 6 insertions, 9 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index a77c7c61686b..732a637eda81 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -271,7 +271,7 @@ class GtkSalFrame : public SalFrame guint time, gpointer frame); static void gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdouble velocity_y, gpointer frame); - static void gestureLongPress(GtkGestureLongPress* gesture, gpointer frame); + static void gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame); #else static gboolean signalExpose( GtkWidget*, GdkEventExpose*, gpointer ); void askForXEmbedFocus( sal_Int32 nTimecode ); diff --git a/vcl/unx/gtk3/gtk3gtkframe.cxx b/vcl/unx/gtk3/gtk3gtkframe.cxx index adcde282e3b1..95898a0f827e 100644 --- a/vcl/unx/gtk3/gtk3gtkframe.cxx +++ b/vcl/unx/gtk3/gtk3gtkframe.cxx @@ -2893,17 +2893,14 @@ void GtkSalFrame::gestureSwipe(GtkGestureSwipe* gesture, gdouble velocity_x, gdo } } -void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gpointer frame) +void GtkSalFrame::gestureLongPress(GtkGestureLongPress* gesture, gdouble x, gdouble y, gpointer frame) { - GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - - if(pThis) + 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; + GtkSalFrame* pThis = static_cast<GtkSalFrame*>(frame); - gdouble x, y; - GdkEventSequence *sequence = gtk_gesture_single_get_current_sequence(GTK_GESTURE_SINGLE(gesture)); - gtk_gesture_get_point(GTK_GESTURE(gesture), sequence, &x, &y); + SalLongPressEvent aEvent; aEvent.mnX = x; aEvent.mnY = y; |