From b6b9cf0039f8573235d41caa78f9212e413ee693 Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Thu, 10 Aug 2023 19:10:31 +0200
Subject: [PATCH] basic adjustments

---
 src/controls/QskSwipeView.cpp | 62 ++++++++++++++++++++---------------
 src/controls/QskSwipeView.h   | 16 +++++----
 2 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/src/controls/QskSwipeView.cpp b/src/controls/QskSwipeView.cpp
index 97cb574e..3994c6c7 100644
--- a/src/controls/QskSwipeView.cpp
+++ b/src/controls/QskSwipeView.cpp
@@ -14,8 +14,7 @@ class QskSwipeView::PrivateData
 {
   public:
     QskPanGestureRecognizer panRecognizer;
-    int panRecognizerTimeout = 100;
-    int duration = 500;
+    int duration = -1; // should be a skinHint
 };
 
 QSK_SUBCONTROL( QskSwipeView, Panel )
@@ -24,21 +23,33 @@ QskSwipeView::QskSwipeView( QQuickItem* parent )
     : Inherited( parent )
     , m_data( new PrivateData() )
 {
-    setSubcontrolProxy( QskBox::Panel, Panel );
-
     setFiltersChildMouseEvents( true );
-
     setAcceptedMouseButtons( Qt::LeftButton );
 
-    m_data->panRecognizer.setWatchedItem( this );
-    m_data->panRecognizer.setOrientations( Qt::Horizontal );
-    m_data->panRecognizer.setMinDistance( 50 );
+    auto& recognizer = m_data->panRecognizer;
+
+    recognizer.setWatchedItem( this );
+
+    // should be skin hints
+    recognizer.setOrientations( Qt::Horizontal );
+    recognizer.setMinDistance( 50 );
+    recognizer.setTimeout( 100 );
+
+    resetDuration();
 }
 
 QskSwipeView::~QskSwipeView()
 {
 }
 
+QskAspect::Subcontrol QskSwipeView::effectiveSubcontrol(
+    QskAspect::Subcontrol subControl ) const
+{
+    if ( subControl == QskBox::Panel )
+        return QskSwipeView::Panel;
+
+    return Inherited::effectiveSubcontrol( subControl );
+}
 
 int QskSwipeView::duration() const
 {
@@ -50,8 +61,12 @@ void QskSwipeView::setDuration( int duration )
     m_data->duration = duration;
 }
 
+void QskSwipeView::resetDuration()
+{
+    m_data->duration = 500;
+}
 
-bool QskSwipeView::gestureFilter( QQuickItem* item, QEvent* event )
+bool QskSwipeView::gestureFilter( const QQuickItem* item, const QEvent* event )
 {
     // see QskScrollBox.cpp
 
@@ -59,26 +74,21 @@ bool QskSwipeView::gestureFilter( QQuickItem* item, QEvent* event )
 
     if ( event->type() == QEvent::MouseButtonPress )
     {
-        if ( ( item != this ) && ( recognizer.timeout() < 0 ) )
-        {
-            const auto mouseEvent = static_cast< QMouseEvent* >( event );
-
-            if ( recognizer.hasProcessedBefore( mouseEvent ) )
-                return false;
-        }
-
-        recognizer.setTimeout( ( item == this ) ? -1 : m_data->panRecognizerTimeout );
+        auto mouseEvent = static_cast< const QMouseEvent* >( event );
+        if ( recognizer.hasProcessedBefore( mouseEvent ) )
+            return false;
     }
 
-    return m_data->panRecognizer.processEvent( item, event );
+    return recognizer.processEvent( item, event );
+
 }
 
 void QskSwipeView::gestureEvent( QskGestureEvent* event )
 {
-    if( event->gesture()->type() == QskGesture::Pan && event->gesture()->state() == QskGesture::Started )
-    {
-        const auto gesture = static_cast< const QskPanGesture* >( event->gesture().get() );
+    const auto gesture = static_cast< const QskPanGesture* >( event->gesture().get() );
 
+    if( gesture->type() == QskGesture::Pan && gesture->state() == QskGesture::Started )
+    {
         auto animator = dynamic_cast< QskStackBoxAnimator1* >( this->animator() );
 
         if ( animator == nullptr )
@@ -88,7 +98,7 @@ void QskSwipeView::gestureEvent( QskGestureEvent* event )
         }
 
         animator->setDuration( m_data->duration );
-        setAnimator( animator );
+        QskStackBox::setAnimator( animator );
 
         const auto direction = ( ( gesture->angle() < 90.0 ) || ( gesture->angle() > 270.0 ) )
             ? Qsk::LeftToRight : Qsk::RightToLeft;
@@ -101,12 +111,10 @@ void QskSwipeView::gestureEvent( QskGestureEvent* event )
         newIndex %= itemCount();
 
         setCurrentIndex( newIndex );
-    }
-    else
-    {
-        Inherited::gestureEvent( event );
+        return;
     }
 
+    Inherited::gestureEvent( event );
 }
 
 #include "moc_QskSwipeView.cpp"
diff --git a/src/controls/QskSwipeView.h b/src/controls/QskSwipeView.h
index cbcc9c0e..bebb976d 100644
--- a/src/controls/QskSwipeView.h
+++ b/src/controls/QskSwipeView.h
@@ -8,14 +8,13 @@
 
 #include "QskStackBox.h"
 
-class QskTabBar;
-class QskTabButton;
-
 class QSK_EXPORT QskSwipeView : public QskStackBox
 {
     Q_OBJECT
 
-    typedef QskStackBox Inherited;
+    Q_PROPERTY( int duration READ duration WRITE setDuration RESET resetDuration )
+
+    using Inherited = QskStackBox;
 
   public:
     QSK_SUBCONTROLS( Panel )
@@ -25,12 +24,17 @@ class QSK_EXPORT QskSwipeView : public QskStackBox
 
     int duration() const;
     void setDuration( int );
+    void resetDuration();
+
+    QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const;
 
   protected:
-    bool gestureFilter( QQuickItem*, QEvent* ) override final;
-    void gestureEvent( QskGestureEvent* ) override final;
+    bool gestureFilter( const QQuickItem*, const QEvent* ) override;
+    void gestureEvent( QskGestureEvent* ) override;
 
   private:
+    void setAnimator( QskStackBoxAnimator* ) = delete;
+
     class PrivateData;
     std::unique_ptr< PrivateData > m_data;
 };