subcontrol substitution fixed
This commit is contained in:
parent
22f0627c56
commit
635691a075
|
@ -138,13 +138,13 @@ void QskSwipeView::gestureEvent( QskGestureEvent* event )
|
|||
Inherited::gestureEvent( event );
|
||||
}
|
||||
|
||||
QskAspect::Subcontrol QskSwipeView::effectiveSubcontrol(
|
||||
QskAspect::Subcontrol QskSwipeView::substitutedSubcontrol(
|
||||
QskAspect::Subcontrol subControl ) const
|
||||
{
|
||||
if ( subControl == QskBox::Panel )
|
||||
return QskSwipeView::Panel;
|
||||
|
||||
return Inherited::effectiveSubcontrol( subControl );
|
||||
return Inherited::substitutedSubcontrol( subControl );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -49,8 +49,6 @@ class QSK_EXPORT QskSwipeView : public QskStackBox
|
|||
void setSwipeDistance( int );
|
||||
void resetSwipeDistance();
|
||||
|
||||
QskAspect::Subcontrol effectiveSubcontrol( QskAspect::Subcontrol ) const;
|
||||
|
||||
Q_SIGNALS:
|
||||
void orientationChanged( Qt::Orientation );
|
||||
void durationChanged( int );
|
||||
|
@ -58,6 +56,8 @@ class QSK_EXPORT QskSwipeView : public QskStackBox
|
|||
|
||||
protected:
|
||||
void gestureEvent( QskGestureEvent* ) override;
|
||||
QskAspect::Subcontrol substitutedSubcontrol( QskAspect::Subcontrol ) const override;
|
||||
|
||||
|
||||
private:
|
||||
void setAnimator( QskStackBoxAnimator* ) = delete;
|
||||
|
|
Loading…
Reference in New Issue