Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:18:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix auto-selecting subdir and not showing Choose when no row selected

Browse source
This commit is contained in:
David Back 2018-06-04 11:10:29 -07:00
parent 64cccc55d4
commit 074892591d
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/resources/qml/dialogs/FileDialog.qml
View file

@ -332,6 +332,7 @@ ModalWindow {
} }
onFolderChanged: { onFolderChanged: {
d.clearSelection();
fileTableModel.update(); // Update once the data from the folder change is available. fileTableModel.update(); // Update once the data from the folder change is available.
} }
@ -451,7 +452,7 @@ ModalWindow {
rows = 0, rows = 0,
i; i;
var newFilesModel = filesModelBuilder.createObject(root); filesModel = filesModelBuilder.createObject(root);
comparisonFunction = sortOrder === Qt.AscendingOrder comparisonFunction = sortOrder === Qt.AscendingOrder
? function(a, b) { return a < b; } ? function(a, b) { return a < b; }
@ -473,7 +474,7 @@ ModalWindow {
while (lower < upper) { while (lower < upper) {
middle = Math.floor((lower + upper) / 2); middle = Math.floor((lower + upper) / 2);
var lessThan; var lessThan;
if (comparisonFunction(sortValue, newFilesModel.get(middle)[sortField])) { if (comparisonFunction(sortValue, filesModel.get(middle)[sortField])) {
lessThan = true; lessThan = true;
upper = middle; upper = middle;
} else { } else {
@ -482,7 +483,7 @@ ModalWindow {
} }
} }
newFilesModel.insert(lower, { filesModel.insert(lower, {
fileName: fileName, fileName: fileName,
fileModified: (fileIsDir ? new Date(0) : model.getItem(i, "fileModified")), fileModified: (fileIsDir ? new Date(0) : model.getItem(i, "fileModified")),
fileSize: model.getItem(i, "fileSize"), fileSize: model.getItem(i, "fileSize"),
@ -493,9 +494,6 @@ ModalWindow {
rows++; rows++;
} }
filesModel = newFilesModel;
d.clearSelection();
} }
} }