QskDrawer::interactive, gesture handling for closing

src/controls/QskDrawer.cpp

@@ -26,6 +26,12 @@ QSK_QT_PRIVATE_END
  */
 QSK_SUBCONTROL( QskDrawer, Panel )
 
+static inline qreal qskDefaultDragMargin()
+{
+    // a skin hint ???
+    return QGuiApplication::styleHints()->startDragDistance();
+}
+
 static void qskCatchMouseEvents( QQuickItem* item )
 {
 #if 1
@@ -196,13 +202,17 @@ namespace
         bool isAcceptedPos( const QPointF& pos ) const override
         {
             auto drawer = qobject_cast< const QskDrawer* >( targetItem() );
-
+            if ( drawer->isFading() )
-            const auto dragMargin = drawer->dragMargin();
-            if ( dragMargin <= 0.0 )
                 return false;
 
             auto rect = qskItemRect( watchedItem() );
 
+            if ( !drawer->isOpen() )
+            {
+                const auto dragMargin = drawer->dragMargin();
+                if ( dragMargin <= 0.0 )
+                    return false;
+
                 switch( drawer->edge() )
                 {
                     case Qt::LeftEdge:
@@ -221,6 +231,7 @@ namespace
                         rect.setTop( rect.bottom() - dragMargin );
                         break;
                 }
+            }
 
             return rect.contains( pos );
         }
@@ -234,8 +245,7 @@ class QskDrawer::PrivateData
     GestureRecognizer* gestureRecognizer = nullptr;
     GeometryListener* listener = nullptr;
 
-    // a skin hint ???
+    qreal dragMargin = qskDefaultDragMargin();
-    qreal dragMargin = QGuiApplication::styleHints()->startDragDistance();
 };
 
 QskDrawer::QskDrawer( QQuickItem* parentItem )
@@ -247,6 +257,7 @@ QskDrawer::QskDrawer( QQuickItem* parentItem )
 #endif
 
     setAutoLayoutChildren( true );
+    setInteractive( true );
 
     setPopupFlag( PopupFlag::CloseOnPressOutside, true );
     setFaderAspect( Panel | QskAspect::Position | QskAspect::Metric );
@@ -258,13 +269,7 @@ QskDrawer::QskDrawer( QQuickItem* parentItem )
      */
     setPlacementPolicy( QskPlacementPolicy::Ignore );
     if ( parentItem )
-    {
         m_data->listener = new GeometryListener( parentItem, this );
-        qskCatchMouseEvents( parentItem );
-    }
-
-    m_data->gestureRecognizer = new GestureRecognizer( this );
-
 
     connect( this, &QskPopup::openChanged, this, &QskDrawer::setFading );
 
@@ -297,6 +302,32 @@ void QskDrawer::setEdge( Qt::Edge edge )
     edgeChanged( edge );
 }
 
+void QskDrawer::setInteractive( bool on )
+{
+    if ( on == isInteractive() )
+        return;
+
+    if ( on )
+    {
+        m_data->gestureRecognizer = new GestureRecognizer( this );
+        if ( parentItem() )
+            qskCatchMouseEvents( parentItem() );
+    }
+    else
+    {
+        // how to revert qskCatchMouseEvents properly ???
+        delete m_data->gestureRecognizer;
+        m_data->gestureRecognizer = nullptr;
+    }
+
+    Q_EMIT interactiveChanged( on );
+}
+
+bool QskDrawer::isInteractive() const
+{
+    return m_data->gestureRecognizer != nullptr;
+}
+
 void QskDrawer::setDragMargin( qreal margin )
 {
     margin = std::max( margin, 0.0 );
@@ -308,6 +339,11 @@ void QskDrawer::setDragMargin( qreal margin )
     }
 }
 
+void QskDrawer::resetDragMargin()
+{
+    setDragMargin( qskDefaultDragMargin() );
+}
+
 qreal QskDrawer::dragMargin() const
 {
     return m_data->dragMargin;
@@ -324,8 +360,9 @@ void QskDrawer::gestureEvent( QskGestureEvent* event )
         const auto gesture = static_cast< const QskPanGesture* >( event->gesture().get() );
         if ( gesture->state() == QskGesture::Finished )
         {
-            if ( qskCheckDirection( m_data->edge, gesture ) )
+            const auto forwards = qskCheckDirection( m_data->edge, gesture );
-                open();
+            if ( forwards != isOpen() )
+                setOpen( forwards );
         }
 
         return;
@@ -355,7 +392,7 @@ void QskDrawer::itemChange( QQuickItem::ItemChange change,
     {
         case QQuickItem::ItemParentHasChanged:
         {
-            if ( parentItem() )
+            if ( parentItem() && isInteractive() )
                 qskCatchMouseEvents( parentItem() );
 
             Q_FALLTHROUGH();

src/controls/QskDrawer.h

@@ -18,7 +18,10 @@ class QSK_EXPORT QskDrawer : public QskPopup
     Q_PROPERTY( Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged )
 
     Q_PROPERTY( qreal dragMargin READ dragMargin
-        WRITE setDragMargin NOTIFY dragMarginChanged )
+        WRITE setDragMargin RESET resetDragMargin NOTIFY dragMarginChanged )
+
+    Q_PROPERTY( bool interactive READ isInteractive
+        WRITE setInteractive NOTIFY interactiveChanged )
 
   public:
     QSK_SUBCONTROLS( Panel )
@@ -29,7 +32,11 @@ class QSK_EXPORT QskDrawer : public QskPopup
     void setEdge( Qt::Edge );
     Qt::Edge edge() const;
 
+    void setInteractive( bool );
+    bool isInteractive() const;
+
     void setDragMargin( qreal );
+    void resetDragMargin();
     qreal dragMargin() const;
 
     QRectF layoutRectForSize( const QSizeF& ) const override;
@@ -37,6 +44,7 @@ class QSK_EXPORT QskDrawer : public QskPopup
   Q_SIGNALS:
     void edgeChanged( Qt::Edge );
     void dragMarginChanged( qreal );
+    void interactiveChanged( bool );
 
   protected:
     void itemChange( ItemChange, const ItemChangeData& ) override;