do not expand tree by defailt if it supports incremental fetching, correct count in header

browse-v2
Zlatin Balevsky 2022-08-28 03:38:46 +01:00
parent 3cfd7c8833
commit 534b61e06a
No known key found for this signature in database
GPG Key ID: A72832072D525E41
3 changed files with 10 additions and 6 deletions

View File

@ -100,7 +100,6 @@ class BrowseController {
synchronized (model.allResults) {
model.allResults.addAll(results)
}
model.resultCount = model.results.size()
}
List<UIBrowseDirEvent> dirsCopy
@ -110,12 +109,15 @@ class BrowseController {
}
for (UIBrowseDirEvent event : dirsCopy) {
model.resultsTreeModel.addToTree(event)
model.allDirs.add(event)
}
if (model.visible && !(resultsCopy.isEmpty() && dirsCopy.isEmpty())) {
view.refreshResults()
}
model.resultCount = model.results.size() + model.allDirs.size()
List<BrowseStatusEvent> statusCopy
synchronized (model.pendingStatuses) {
statusCopy = new ArrayList<>(model.pendingStatuses)

View File

@ -37,6 +37,7 @@ class BrowseModel {
def results = []
List<UIResultEvent> allResults = []
List<UIBrowseDirEvent> allDirs = []
boolean visible = true
List<UIResultBatchEvent> pendingResults = Collections.synchronizedList(new ArrayList<>())

View File

@ -329,11 +329,12 @@ class BrowseView {
TreePath[] selectedPaths = tree.getSelectionPaths()
Set<TreePath> expanded = new HashSet<>(treeExpansions.expandedPaths)
model.resultsTreeModel.nodeStructureChanged(model.root)
if (treeExpansions.manualExpansion)
expanded.each { tree.expandPath(it) }
else
TreeUtil.expand(tree)
if (model.session == null && !model.session.supportsIncremental()) {
if (treeExpansions.manualExpansion)
expanded.each { tree.expandPath(it) }
else
TreeUtil.expand(tree)
}
tree.setSelectionPaths(selectedPaths)
}