summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-28 12:37:37 +0100
committerCaolán McNamara <caolanm@redhat.com>2021-05-28 15:09:50 +0200
commit2659a8685ae55c95aeaaca288caeed253274c853 (patch)
treed4741986164dffb14db4bb0c2f2a628153045b07 /vcl
parentb8fff7f442f5ddeb83d9bcb9f48e402954a4ab45 (diff)
gtk4: restore double-clicks in DrawingArea
Change-Id: I8bdbba3148bb7447f511938d79b878cf1626dd37 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116327 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/unx/gtk3/gtkinst.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 6a8debab4a19..ec129f1b9c11 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -2484,21 +2484,21 @@ private:
}
#if GTK_CHECK_VERSION(4, 0, 0)
- static void signalButtonPress(GtkGestureClick* pGesture, int /*n_press*/, gdouble x, gdouble y, gpointer widget)
+ static void signalButtonPress(GtkGestureClick* pGesture, int n_press, gdouble x, gdouble y, gpointer widget)
{
GtkInstanceWidget* pThis = static_cast<GtkInstanceWidget*>(widget);
SolarMutexGuard aGuard;
- pThis->signal_button(pGesture, SalEvent::MouseButtonDown, x, y);
+ pThis->signal_button(pGesture, SalEvent::MouseButtonDown, n_press, x, y);
}
- static void signalButtonRelease(GtkGestureClick* pGesture, int /*n_press*/, gdouble x, gdouble y, gpointer widget)
+ static void signalButtonRelease(GtkGestureClick* pGesture, int n_press, gdouble x, gdouble y, gpointer widget)
{
GtkInstanceWidget* pThis = static_cast<GtkInstanceWidget*>(widget);
SolarMutexGuard aGuard;
- pThis->signal_button(pGesture, SalEvent::MouseButtonUp, x, y);
+ pThis->signal_button(pGesture, SalEvent::MouseButtonUp, n_press, x, y);
}
- void signal_button(GtkGestureClick* pGesture, SalEvent nEventType, gdouble x, gdouble y)
+ void signal_button(GtkGestureClick* pGesture, SalEvent nEventType, int n_press, gdouble x, gdouble y)
{
m_nPressedButton = -1;
@@ -2527,7 +2527,7 @@ private:
sal_uInt32 nModCode = GtkSalFrame::GetMouseModCode(eType);
// strip out which buttons are involved from the nModCode and replace with m_nLastMouseButton
sal_uInt16 nCode = m_nLastMouseButton | (nModCode & (KEY_SHIFT | KEY_MOD1 | KEY_MOD2));
- MouseEvent aMEvt(aPos, 1, ImplGetMouseButtonMode(m_nLastMouseButton, nModCode), nCode, nCode);
+ MouseEvent aMEvt(aPos, n_press, ImplGetMouseButtonMode(m_nLastMouseButton, nModCode), nCode, nCode);
if (nEventType == SalEvent::MouseButtonDown && m_aMousePressHdl.Call(aMEvt))
gtk_gesture_set_state(GTK_GESTURE(pGesture), GTK_EVENT_SEQUENCE_CLAIMED);