mirror of https://github.com/zlatinb/muwire
do not expand tree by defailt if it supports incremental fetching, correct count in header
parent
3cfd7c8833
commit
534b61e06a
|
@ -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)
|
||||
|
|
|
@ -37,6 +37,7 @@ class BrowseModel {
|
|||
|
||||
def results = []
|
||||
List<UIResultEvent> allResults = []
|
||||
List<UIBrowseDirEvent> allDirs = []
|
||||
|
||||
boolean visible = true
|
||||
List<UIResultBatchEvent> pendingResults = Collections.synchronizedList(new ArrayList<>())
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue