Cleanup
This commit is contained in:
parent
798f0a148d
commit
55925c2774
@ -1,4 +1,5 @@
|
|||||||
#include "QskDrawer.h"
|
#include "QskDrawer.h"
|
||||||
|
#include "QskAspect.h"
|
||||||
|
|
||||||
#include <QskPopup.h>
|
#include <QskPopup.h>
|
||||||
#include <QskBox.h>
|
#include <QskBox.h>
|
||||||
@ -9,7 +10,6 @@ QSK_SUBCONTROL( QskDrawer, DasPanel )
|
|||||||
|
|
||||||
class QskDrawer::PrivateData {
|
class QskDrawer::PrivateData {
|
||||||
public:
|
public:
|
||||||
QskControl* control = nullptr;
|
|
||||||
QskBox* content;
|
QskBox* content;
|
||||||
Qt::Edge edge = Qt::LeftEdge;
|
Qt::Edge edge = Qt::LeftEdge;
|
||||||
};
|
};
|
||||||
@ -18,19 +18,18 @@ QskDrawer::QskDrawer( QQuickItem* parentItem ) :
|
|||||||
Inherited ( parentItem )
|
Inherited ( parentItem )
|
||||||
, m_data( new PrivateData { } )
|
, m_data( new PrivateData { } )
|
||||||
{
|
{
|
||||||
using Q = QskDrawer;
|
|
||||||
setZ( 1 );
|
setZ( 1 );
|
||||||
|
|
||||||
setPopupFlag( PopupFlag::CloseOnPressOutside, true );
|
setPopupFlag( PopupFlag::CloseOnPressOutside, true );
|
||||||
|
|
||||||
m_data->content = new QskBox(this);
|
m_data->content = new QskBox(this);
|
||||||
m_data->content->setSubcontrolProxy( QskBox::Panel, QskDrawer::DasPanel );
|
m_data->content->setSubcontrolProxy( QskBox::Panel, DasPanel );
|
||||||
|
|
||||||
setAnimationHint( DasPanel | QskAspect::Position, QskAnimationHint( 1000 ) );
|
setAnimationHint( DasPanel | QskAspect::Position, QskAnimationHint( 1000 ) );
|
||||||
|
|
||||||
setFaderAspect( DasPanel | QskAspect::Metric );
|
setFaderAspect( DasPanel | QskAspect::Metric );
|
||||||
|
|
||||||
setSkinHint( Q::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( DasPanel | QskAspect::Metric,
|
||||||
@ -57,15 +56,10 @@ void QskDrawer::setEdge( Qt::Edge edge ) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void QskDrawer::setContent( QskControl* t ) {
|
void QskDrawer::setContent( QskControl* t ) {
|
||||||
m_data->control = t;
|
|
||||||
t->setParentItem( m_data->content );
|
t->setParentItem( m_data->content );
|
||||||
}
|
}
|
||||||
|
|
||||||
void QskDrawer::updateLayout() {
|
void QskDrawer::updateLayout() {
|
||||||
if( !m_data->control ) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto rect = parentItem()->childrenRect();
|
auto rect = parentItem()->childrenRect();
|
||||||
|
|
||||||
switch( m_data->edge ) {
|
switch( m_data->edge ) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user