goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/griffon-app/controllers/com/muwire/gui/BrowseController.groovy
View File

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

1
gui/griffon-app/models/com/muwire/gui/BrowseModel.groovy
View File

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

11
gui/griffon-app/views/com/muwire/gui/BrowseView.groovy
View File

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