sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-27 00:33:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Try to fix QgsCollapsibleGroupBox crash on Qt 5.10

Browse Source 
Automatic memory management: prevent button to be
deleted too early.
This commit is contained in:
Alessandro Pasotti 2018-02-12 11:52:03 +01:00
parent a7870afab1
commit d4063e8b67
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/qgscollapsiblegroupbox.cpp
View File

@ -58,17 +58,17 @@ void QgsCollapsibleGroupBoxBasic::init()
mExpandIcon = QgsApplication::getThemeIcon( QStringLiteral( "/mIconExpand.svg" ) ); mExpandIcon = QgsApplication::getThemeIcon( QStringLiteral( "/mIconExpand.svg" ) );
// collapse button // collapse button
mCollapseButton = new QgsGroupBoxCollapseButton( this ); mCollapseButton = qgis::make_unique<QgsGroupBoxCollapseButton>( nullptr );
mCollapseButton->setObjectName( QStringLiteral( "collapseButton" ) ); mCollapseButton->setObjectName( QStringLiteral( "collapseButton" ) );
mCollapseButton->setAutoRaise( true ); mCollapseButton->setAutoRaise( true );
mCollapseButton->setFixedSize( 16, 16 ); mCollapseButton->setFixedSize( 16, 16 );
// TODO set size (as well as margins) depending on theme, in updateStyle() // TODO set size (as well as margins) depending on theme, in updateStyle()
mCollapseButton->setIconSize( QSize( 12, 12 ) ); mCollapseButton->setIconSize( QSize( 12, 12 ) );
mCollapseButton->setIcon( mCollapseIcon ); mCollapseButton->setIcon( mCollapseIcon );
setFocusProxy( mCollapseButton ); setFocusProxy( mCollapseButton.get() );
setFocusPolicy( Qt::StrongFocus ); setFocusPolicy( Qt::StrongFocus );
connect( mCollapseButton, &QAbstractButton::clicked, this, &QgsCollapsibleGroupBoxBasic::toggleCollapsed ); connect( mCollapseButton.get(), &QAbstractButton::clicked, this, &QgsCollapsibleGroupBoxBasic::toggleCollapsed );
connect( this, &QGroupBox::toggled, this, &QgsCollapsibleGroupBoxBasic::checkToggled ); connect( this, &QGroupBox::toggled, this, &QgsCollapsibleGroupBoxBasic::checkToggled );
connect( this, &QGroupBox::clicked, this, &QgsCollapsibleGroupBoxBasic::checkClicked ); connect( this, &QGroupBox::clicked, this, &QgsCollapsibleGroupBoxBasic::checkClicked );
} }
@ -221,7 +221,7 @@ void QgsCollapsibleGroupBoxBasic::toggleCollapsed()
{ {
// verify if sender is this group box's collapse button // verify if sender is this group box's collapse button
QgsGroupBoxCollapseButton *collBtn = qobject_cast<QgsGroupBoxCollapseButton *>( QObject::sender() ); QgsGroupBoxCollapseButton *collBtn = qobject_cast<QgsGroupBoxCollapseButton *>( QObject::sender() );
bool senderCollBtn = ( collBtn && collBtn == mCollapseButton ); bool senderCollBtn = ( collBtn && collBtn == mCollapseButton.get() );
mAltDown = ( mAltDown || mCollapseButton->altDown() ); mAltDown = ( mAltDown || mCollapseButton->altDown() );
mShiftDown = ( mShiftDown || mCollapseButton->shiftDown() ); mShiftDown = ( mShiftDown || mCollapseButton->shiftDown() );
@ -426,7 +426,7 @@ void QgsCollapsibleGroupBoxBasic::setCollapsed( bool collapse )
mParentScrollArea->ensureWidgetVisible( this ); mParentScrollArea->ensureWidgetVisible( this );
//and then make sure the top of the widget is visible - otherwise tall group boxes //and then make sure the top of the widget is visible - otherwise tall group boxes
//scroll to their centres, which is disorienting for users //scroll to their centres, which is disorienting for users
mParentScrollArea->ensureWidgetVisible( mCollapseButton, 0, 5 ); mParentScrollArea->ensureWidgetVisible( mCollapseButton.get(), 0, 5 );
mParentScrollArea->setUpdatesEnabled( true ); mParentScrollArea->setUpdatesEnabled( true );
} }
// emit signal for connections using collapsed state // emit signal for connections using collapsed state
@ -444,7 +444,7 @@ void QgsCollapsibleGroupBoxBasic::collapseExpandFixes()
Q_FOREACH ( QObject *child, children() ) Q_FOREACH ( QObject *child, children() )
{ {
QWidget *w = qobject_cast<QWidget *>( child ); QWidget *w = qobject_cast<QWidget *>( child );
if ( w && w != mCollapseButton ) if ( w && w != mCollapseButton.get() )
{ {
w->setProperty( hideKey, true ); w->setProperty( hideKey, true );
w->hide(); w->hide();
@ -456,7 +456,7 @@ void QgsCollapsibleGroupBoxBasic::collapseExpandFixes()
Q_FOREACH ( QObject *child, children() ) Q_FOREACH ( QObject *child, children() )
{ {
QWidget *w = qobject_cast<QWidget *>( child ); QWidget *w = qobject_cast<QWidget *>( child );
if ( w && w != mCollapseButton ) if ( w && w != mCollapseButton.get() )
{ {
if ( w->property( hideKey ).toBool() ) if ( w->property( hideKey ).toBool() )
w->show(); w->show();

2
src/gui/qgscollapsiblegroupbox.h
View File

@ -157,7 +157,7 @@ class GUI_EXPORT QgsCollapsibleGroupBoxBasic : public QGroupBox
bool mScrollOnExpand; bool mScrollOnExpand;
bool mShown; bool mShown;
QScrollArea *mParentScrollArea = nullptr; QScrollArea *mParentScrollArea = nullptr;
QgsGroupBoxCollapseButton *mCollapseButton = nullptr; std::unique_ptr<QgsGroupBoxCollapseButton> mCollapseButton;
QWidget *mSyncParent = nullptr; QWidget *mSyncParent = nullptr;
QString mSyncGroup; QString mSyncGroup;
bool mAltDown; bool mAltDown;