diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 15:05:27 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-18 16:24:11 +0200 |
| commit | 7f60978b2ccd0e17816b78bde60c6e0e60a9d52e (patch) | |
| tree | feb12ebdf4c2bfd15f08ec170ee18a099e8eb21a /vcl/inc | |
| parent | 5206b0376dcd511843f0e6cb072fe4184adcc487 (diff) | |
Related: rhbz#1367846 queue and merge scroll events
Change-Id: Ib45f61bbb35bd240829491ac8a79803222974778
Reviewed-on: https://gerrit.libreoffice.org/37779
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index 00a687422f82..37a4facabd0c 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -30,6 +30,7 @@ #include <gdk/gdkkeysyms.h> #include <salframe.hxx> +#include <vcl/idle.hxx> #include <vcl/sysdata.hxx> #include <unx/nativewindowhandleprovider.hxx> #include <unx/saltype.h> @@ -280,7 +281,7 @@ class GtkSalFrame : public SalFrame static gboolean signalKey( GtkWidget*, GdkEventKey*, gpointer ); static gboolean signalDelete( GtkWidget*, GdkEvent*, gpointer ); static gboolean signalWindowState( GtkWidget*, GdkEvent*, gpointer ); - static gboolean signalScroll( GtkWidget*, GdkEventScroll*, gpointer ); + static gboolean signalScroll( GtkWidget*, GdkEvent*, gpointer ); static gboolean signalCrossing( GtkWidget*, GdkEventCrossing*, gpointer ); static gboolean signalVisibility( GtkWidget*, GdkEventVisibility*, gpointer ); static void signalDestroy( GtkWidget*, gpointer ); @@ -347,6 +348,8 @@ public: cairo_surface_t* m_pSurface; basegfx::B2IVector m_aFrameSize; DamageHandler m_aDamageHandler; + std::vector<GdkEvent*> m_aPendingScrollEvents; + Idle m_aSmoothScrollIdle; int m_nGrabLevel; bool m_bSalObjectSetPosSize; #endif @@ -427,6 +430,10 @@ public: void removeGrabLevel(); void nopaint_container_resize_children(GtkContainer*); + + void LaunchAsyncScroll(GdkEvent* pEvent); + DECL_LINK(AsyncScroll, Timer *, void); + #endif virtual ~GtkSalFrame() override; |