napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[netinstall] Only update selectedness of parents with children.

Browse Source 
While walking up the tree, only switch the selectedness states
of parents with children. This avoids the case where a parent
has a first subgroup that is hidden -- in which case the
parent ends up with no children, and is unselected even though
it is marked as selected in the config file.

FIXES #864
This commit is contained in:
Adriaan de Groot 2017-11-21 05:36:30 -05:00
parent 7e2e2cabfe
commit 71e80f680e
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/netinstall/PackageTreeItem.cpp
View File

@ -169,16 +169,22 @@ PackageTreeItem::setSelected( Qt::CheckState isSelected )
PackageTreeItem* currentItem = parentItem(); PackageTreeItem* currentItem = parentItem();
while ( currentItem != nullptr ) while ( currentItem != nullptr )
{ {
if ( currentItem->childCount() == 0)
{
currentItem = currentItem->parentItem();
continue;
}
int childrenSelected = 0; int childrenSelected = 0;
bool isChildPartiallySelected = false; int childrenPartiallySelected = 0;
for ( int i = 0; i < currentItem->childCount(); i++ ) for ( int i = 0; i < currentItem->childCount(); i++ )
{ {
if ( currentItem->child( i )->isSelected() == Qt::Checked ) if ( currentItem->child( i )->isSelected() == Qt::Checked )
childrenSelected++; childrenSelected++;
if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked ) if ( currentItem->child( i )->isSelected() == Qt::PartiallyChecked )
isChildPartiallySelected = true; childrenPartiallySelected++;
} }
if ( !childrenSelected && !isChildPartiallySelected ) if ( !childrenSelected && !childrenPartiallySelected)
currentItem->m_data.selected = Qt::Unchecked; currentItem->m_data.selected = Qt::Unchecked;
else if ( childrenSelected == currentItem->childCount() ) else if ( childrenSelected == currentItem->childCount() )
currentItem->m_data.selected = Qt::Checked; currentItem->m_data.selected = Qt::Checked;