Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-11-03 21:24:30 +03:00
Code Issues Projects Releases Wiki Activity

updateView() must be done before expandAll is done, otherwise the collapse counter is wrong and an assert will be triggered

Browse Source
This commit is contained in:
Martin Marmsoler 2023-11-12 18:10:12 +01:00
parent d598ac21fa
commit 986cbf140e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/ui/DoubleTreeWidget.cpp
View File

@ -402,12 +402,6 @@ void DoubleTreeWidget::setDiff(const git::Diff &diff, const QString &file,
TreeProxy *proxy = static_cast<TreeProxy *>(unstagedFiles->model());
DiffTreeModel *model = static_cast<DiffTreeModel *>(proxy->sourceModel());
model->setDiff(diff);
// do not expand if to many files exist, it takes really long
// So do it only when there are less than 100
if (diff.isValid() && diff.count() < fileCountExpansionThreshold)
unstagedFiles->expandAll();
else
unstagedFiles->collapseAll();
// Single tree & list view.
bool singleTree =
@ -431,6 +425,9 @@ void DoubleTreeWidget::setDiff(const git::Diff &diff, const QString &file,
collapseButtonStagedFiles->setVisible(!listView);
collapseButtonUnstagedFiles->setVisible(!listView);
unstagedFiles->updateView(); // Must be before expandAll/collapseAll is done, otherwise the collapse counter is wrong
stagedFiles->updateView();
// If statusDiff, there exist no staged/unstaged, but only
// the commited files must be shown
if (!diff.isValid() || diff.isStatusDiff()) {
@ -447,8 +444,12 @@ void DoubleTreeWidget::setDiff(const git::Diff &diff, const QString &file,
mStagedWidget->setVisible(false);
}
unstagedFiles->updateView();
stagedFiles->updateView();
// do not expand if to many files exist, it takes really long
// So do it only when there are less than 100
if (diff.isValid() && diff.count() < fileCountExpansionThreshold)
unstagedFiles->expandAll();
else
unstagedFiles->collapseAll();
// Clear editor.
mEditor->clear();