168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

harmonized with master

This commit is contained in:
Uwe Rathmann 2023-11-05 13:40:07 +01:00
parent e14c72eca4
commit 8248ecdd90
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/controls/QskDrawer.cpp
View File

@ -364,7 +364,6 @@ void QskDrawer::itemChange( QQuickItem::ItemChange change,
m_data->resetListener( this ); m_data->resetListener( this );
break; break;
} }
case QQuickItem::ItemVisibleHasChanged: case QQuickItem::ItemVisibleHasChanged:
{ {
m_data->resetListener( this ); m_data->resetListener( this );

2
src/controls/QskDrawer.h
View File

@ -23,7 +23,7 @@ class QSK_EXPORT QskDrawer : public QskPopup
WRITE setInteractive NOTIFY interactiveChanged ) WRITE setInteractive NOTIFY interactiveChanged )
public: public:
QSK_SUBCONTROLS( Panel ); QSK_SUBCONTROLS( Panel )
QskDrawer( QQuickItem* = nullptr ); QskDrawer( QQuickItem* = nullptr );
QskDrawer( Qt::Edge, QQuickItem* = nullptr ); QskDrawer( Qt::Edge, QQuickItem* = nullptr );

1
src/controls/QskPopup.cpp
View File

@ -20,7 +20,6 @@ QSK_QT_PRIVATE_BEGIN
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
QSK_SUBCONTROL( QskPopup, Overlay ) QSK_SUBCONTROL( QskPopup, Overlay )
QSK_SYSTEM_STATE( QskPopup, Closed, QskAspect::FirstSystemState << 1 ) QSK_SYSTEM_STATE( QskPopup, Closed, QskAspect::FirstSystemState << 1 )
static void qskSetFocus( QQuickItem* item, bool on ) static void qskSetFocus( QQuickItem* item, bool on )