diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-05-16 10:12:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-05-16 14:35:44 +0200 |
| commit | b53c84af0a34aa9193b0e35363ca2ebe00c3e32c (patch) | |
| tree | b8c4b0dc1efb2eebc13e52a8475931798e2a43b7 /include | |
| parent | 6df22f0ec513415cf6c920c1f8063dabe7303c06 (diff) | |
Resolves: rhbz#1367846 improve gtk3 trackpad scrolling
convert number of "lines" scrolled to double and allow
fractional parts of lines/columns
Change-Id: Ib99c815cfc8823e22fc1d76e201903c34ed0f61b
Reviewed-on: https://gerrit.libreoffice.org/37669
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/commandevent.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/vcl/commandevent.hxx b/include/vcl/commandevent.hxx index 7b143e402ce4..68ea0c5184d7 100644 --- a/include/vcl/commandevent.hxx +++ b/include/vcl/commandevent.hxx @@ -141,7 +141,7 @@ class VCL_DLLPUBLIC CommandWheelData private: long mnDelta; long mnNotchDelta; - sal_uLong mnLines; + double mnLines; CommandWheelMode mnWheelMode; sal_uInt16 mnCode; bool mbHorz; @@ -150,13 +150,13 @@ private: public: CommandWheelData(); CommandWheelData( long nWheelDelta, long nWheelNotchDelta, - sal_uLong nScrollLines, + double nScrollLines, CommandWheelMode nWheelMode, sal_uInt16 nKeyModifier, bool bHorz, bool bDeltaIsPixel = false ); long GetDelta() const { return mnDelta; } long GetNotchDelta() const { return mnNotchDelta; } - sal_uLong GetScrollLines() const { return mnLines; } + double GetScrollLines() const { return mnLines; } bool IsHorz() const { return mbHorz; } bool IsDeltaPixel() const { return mbDeltaIsPixel; } diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d59ac3e99302..7e67182d5095 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -714,9 +714,9 @@ private: SAL_DLLPRIVATE void ImplCallActivateListeners(vcl::Window*); SAL_DLLPRIVATE void ImplCallDeactivateListeners(vcl::Window*); - SAL_DLLPRIVATE static void ImplHandleScroll( ScrollBar* pHScrl, long nX, ScrollBar* pVScrl, long nY ); + SAL_DLLPRIVATE static void ImplHandleScroll(ScrollBar* pHScrl, double nX, ScrollBar* pVScrl, double nY); - SAL_DLLPRIVATE tools::Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const tools::Rectangle& rRect ) const; + SAL_DLLPRIVATE tools::Rectangle ImplOutputToUnmirroredAbsoluteScreenPixel( const tools::Rectangle& rRect ) const; SAL_DLLPRIVATE long ImplGetUnmirroredOutOffX(); // retrieves the list of owner draw decorated windows for this window hiearchy @@ -724,7 +724,7 @@ private: SAL_DLLPRIVATE vcl::Window* ImplGetTopmostFrameWindow(); - SAL_DLLPRIVATE tools::Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; + SAL_DLLPRIVATE tools::Rectangle ImplGetWindowExtentsRelative( vcl::Window *pRelativeWindow, bool bClientOnly ) const; SAL_DLLPRIVATE bool ImplStopDnd(); SAL_DLLPRIVATE void ImplStartDnd(); |