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

disconnect from visibleChanged when being destructed

Browse Source
This commit is contained in:
Uwe Rathmann 2021-11-02 07:47:01 +01:00
parent 0d9dbf4c58
commit 9b0dd47cae
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/dialogs/QskDialogButtonBox.cpp
View File

@ -79,6 +79,28 @@ class QskDialogButtonBox::PrivateData
{
}
static inline void connectButton( QskDialogButtonBox* box,
QskPushButton* button, bool on )
{
if ( on )
{
connect( button, &QskPushButton::clicked,
box, &QskDialogButtonBox::onButtonClicked,
Qt::UniqueConnection );
connect( button, &QskPushButton::visibleChanged,
box, &QskDialogButtonBox::invalidateLayout,
Qt::UniqueConnection );
}
else
{
disconnect( button, &QskPushButton::clicked,
box, &QskDialogButtonBox::onButtonClicked );
disconnect( button, &QskPushButton::visibleChanged,
box, &QskDialogButtonBox::invalidateLayout );
}
}
LayoutEngine layoutEngine;
QVector< QskPushButton* > buttons[ QskDialog::NActionRoles ];
@ -107,6 +129,18 @@ QskDialogButtonBox::QskDialogButtonBox( Qt::Orientation orientation, QQuickItem*
QskDialogButtonBox::~QskDialogButtonBox()
{
for ( int i = 0; i < QskDialog::NActionRoles; i++ )
{
for ( auto button : qskAsConst( m_data->buttons[ i ] ) )
{
/*
The destructor of QQuickItem sets the parentItem of
all children to nullptr, what leads to visibleChanged
signals. So we better disconnect first.
*/
PrivateData::connectButton( this, button, false );
}
}
}
void QskDialogButtonBox::setOrientation( Qt::Orientation orientation )
@ -302,11 +336,7 @@ void QskDialogButtonBox::addButton(
*/
button->setParentItem( this );
connect( button, &QskPushButton::clicked,
this, &QskDialogButtonBox::onButtonClicked );
connect( button, &QskPushButton::visibleChanged,
this, &QskDialogButtonBox::invalidateLayout );
PrivateData::connectButton( this, button, true );
m_data->buttons[ role ].removeOne( button );
m_data->buttons[ role ] += button;
@ -330,11 +360,7 @@ void QskDialogButtonBox::removeButton( QskPushButton* button )
{
if ( m_data->buttons[ i ].removeOne( button ) )
{
disconnect( button, &QskPushButton::clicked,
this, &QskDialogButtonBox::onButtonClicked );
disconnect( button, &QskPushButton::visibleChanged,
this, &QskDialogButtonBox::invalidateLayout );
PrivateData::connectButton( this, button, false );
invalidateLayout();

7
src/layouts/QskLinearBox.cpp
View File

@ -71,7 +71,14 @@ QskLinearBox::~QskLinearBox()
for ( int i = 0; i < engine.count(); i++ )
{
if ( auto item = engine.itemAt( i ) )
{
/*
The destructor of QQuickItem sets the parentItem of
all children to nullptr, what leads to visibleChanged
signals. So we better disconnect first.
*/
setItemActive( item, false );
}
}
}