diff options
author | Povilas Kanapickas <povilas@radix.lt> | 2022-09-02 00:04:41 +0300 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-05 16:21:49 +0200 |
commit | 35319adcc28f197b73e146f9ba233e20616fd11f (patch) | |
tree | 41bf3dcd9461d15d5886cee77e4cf07a9fd51418 /sd | |
parent | 231342ef6a913f0a5c9dfea3bd28830e92a3fc98 (diff) |
vcl: Rename Swipe event to GestureSwipe
We have 5 gesture types: GestureZoom, GestureRotate, GesturePan, Swipe
and LongPress. For consistency all of these will use Gesture as a prefix
to reduce confusion and for easier grepping throughout the codebase.
Change-Id: I8b9e245d011203a19c1172f9833c172f65382caa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139243
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/slideshow.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 35b93afe8b05..2f127f4610a3 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -48,7 +48,7 @@ class Size; namespace vcl { class Window; } class SfxRequest; class WorkWindow; -class CommandSwipeData; +class CommandGestureSwipeData; class CommandLongPressData; struct ImplSVEvent; @@ -145,7 +145,7 @@ public: /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ void pause( bool bPause ); - bool swipe(const CommandSwipeData &rSwipeData); + bool swipe(const CommandGestureSwipeData &rSwipeData); bool longpress(const CommandLongPressData& rLongPressData); // settings diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index bade6d05ec44..00702d422631 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1015,7 +1015,7 @@ void SlideShow::pause( bool bPause ) } } -bool SlideShow::swipe(const CommandSwipeData& rSwipeData) +bool SlideShow::swipe(const CommandGestureSwipeData& rSwipeData) { return mxController.is() && mxController->swipe(rSwipeData); } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9c0d31dead5d..b13ced3c128f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1153,7 +1153,7 @@ void SlideshowImpl::slideEnded(const bool bReverse) gotoNextSlide(); } -bool SlideshowImpl::swipe(const CommandSwipeData &rSwipeData) +bool SlideshowImpl::swipe(const CommandGestureSwipeData &rSwipeData) { if (mbUsePen || mnContextMenuEvent) return false; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 09177762c598..b6cd778d8763 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -185,7 +185,7 @@ public: /// @throws css::uno::RuntimeException void hyperLinkClicked(const OUString & hyperLink); void click(const css::uno::Reference< css::drawing::XShape > & xShape); - bool swipe(const CommandSwipeData &rSwipeData); + bool swipe(const CommandGestureSwipeData &rSwipeData); bool longpress(const CommandLongPressData& rLongPressData); /// ends the presentation async diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 2a249f4a795c..5df0bf11d00a 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -661,12 +661,12 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi switch( rCEvt.GetCommand() ) { - case CommandEventId::Swipe: + case CommandEventId::GestureSwipe: { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if (xSlideShow.is()) { - const CommandSwipeData* pSwipeData = rCEvt.GetSwipeData(); + const CommandGestureSwipeData* pSwipeData = rCEvt.GetGestureSwipeData(); bDone = xSlideShow->swipe(*pSwipeData); } } |