Sane name to subcontrol
This commit is contained in:
parent
cd42cc8ad8
commit
9ef3b8ac6f
|
@ -7,7 +7,7 @@
|
||||||
#include <QskAnimationHint.h>
|
#include <QskAnimationHint.h>
|
||||||
#include <QskQuick.h>
|
#include <QskQuick.h>
|
||||||
|
|
||||||
QSK_SUBCONTROL( QskDrawer, DasPanel )
|
QSK_SUBCONTROL( QskDrawer, Panel )
|
||||||
|
|
||||||
class QskDrawer::PrivateData {
|
class QskDrawer::PrivateData {
|
||||||
public:
|
public:
|
||||||
|
@ -25,17 +25,17 @@ QskDrawer::QskDrawer( QQuickItem* parentItem ) :
|
||||||
setPopupFlag( PopupFlag::CloseOnPressOutside, true );
|
setPopupFlag( PopupFlag::CloseOnPressOutside, true );
|
||||||
|
|
||||||
m_data->contentBox = new QskBox(this);
|
m_data->contentBox = new QskBox(this);
|
||||||
m_data->contentBox->setSubcontrolProxy( QskBox::Panel, DasPanel );
|
m_data->contentBox->setSubcontrolProxy( QskBox::Panel, Panel );
|
||||||
|
|
||||||
setAnimationHint( DasPanel | QskAspect::Position, QskAnimationHint( 1000 ) );
|
setAnimationHint( Panel | QskAspect::Position, QskAnimationHint( 1000 ) );
|
||||||
|
|
||||||
setFaderAspect( DasPanel | QskAspect::Metric );
|
setFaderAspect( Panel | QskAspect::Metric );
|
||||||
|
|
||||||
setSkinHint( Overlay | QskAspect::Style, false );
|
setSkinHint( Overlay | QskAspect::Style, false );
|
||||||
|
|
||||||
connect(this, &QskDrawer::closed, this, [this](){
|
connect(this, &QskDrawer::closed, this, [this](){
|
||||||
startTransition( DasPanel | QskAspect::Metric,
|
startTransition( Panel | QskAspect::Metric,
|
||||||
animationHint( DasPanel | QskAspect::Position ),
|
animationHint( Panel | QskAspect::Position ),
|
||||||
0.0, 1.0 );
|
0.0, 1.0 );
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -105,8 +105,8 @@ void QskDrawer::updateLayout() {
|
||||||
|
|
||||||
void QskDrawer::aboutToShow()
|
void QskDrawer::aboutToShow()
|
||||||
{
|
{
|
||||||
startTransition( DasPanel | QskAspect::Metric,
|
startTransition( Panel | QskAspect::Metric,
|
||||||
animationHint( DasPanel | QskAspect::Position ),
|
animationHint( Panel | QskAspect::Position ),
|
||||||
1.0, 0.0 );
|
1.0, 0.0 );
|
||||||
Inherited::aboutToShow();
|
Inherited::aboutToShow();
|
||||||
}
|
}
|
||||||
|
|
|
@ -14,7 +14,7 @@ class QSK_EXPORT QskDrawer : public QskPopup
|
||||||
Q_PROPERTY( Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged )
|
Q_PROPERTY( Qt::Edge edge READ edge WRITE setEdge NOTIFY edgeChanged )
|
||||||
|
|
||||||
public:
|
public:
|
||||||
QSK_SUBCONTROLS( DasPanel )
|
QSK_SUBCONTROLS( Panel )
|
||||||
QskDrawer( QQuickItem* parentItem = nullptr );
|
QskDrawer( QQuickItem* parentItem = nullptr );
|
||||||
~QskDrawer() override;
|
~QskDrawer() override;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue