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

QskTabView::removeTab fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2019-02-07 13:35:57 +01:00
parent e738c9ec89
commit 7ee3c9faff
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/controls/QskTabView.cpp
View File

@ -11,6 +11,8 @@
#include "QskTabBar.h" #include "QskTabBar.h"
#include "QskTabButton.h" #include "QskTabButton.h"
#include <QPointer>
QSK_SUBCONTROL( QskTabView, TabBar ) QSK_SUBCONTROL( QskTabView, TabBar )
QSK_SUBCONTROL( QskTabView, Page ) QSK_SUBCONTROL( QskTabView, Page )
@ -108,6 +110,9 @@ int QskTabView::insertTab( int index, QskTabButton* button, QQuickItem* item )
{ {
// multiple insertion ??? // multiple insertion ???
if ( item && item->parent() == nullptr )
item->setParent( this );
index = m_data->tabBar->insertTab( index, button ); index = m_data->tabBar->insertTab( index, button );
m_data->stackBox->insertItem( index, item, Qt::Alignment() ); m_data->stackBox->insertItem( index, item, Qt::Alignment() );
@ -128,10 +133,20 @@ void QskTabView::removeTab( int index )
{ {
if ( index >= 0 && index < m_data->tabBar->count() ) if ( index >= 0 && index < m_data->tabBar->count() )
{ {
QPointer< QQuickItem > tabItem = m_data->stackBox->itemAtIndex( index );
// indexes still in sync ??? // indexes still in sync ???
m_data->tabBar->removeTab( index ); m_data->tabBar->removeTab( index );
m_data->stackBox->removeAt( index ); m_data->stackBox->removeAt( index );
if ( tabItem )
{
if ( tabItem->parent() == this )
delete tabItem;
else
tabItem->setParentItem( nullptr );
}
} }
} }