mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Scroll first selected row into view in itemTreeView::selectItems()

Browse source 
Separate out the enhanced ensureRowIsVisible() logic from selectItem()
and call it from selectItems() as well on the first item in the set.
This commit is contained in:
Dan Stillman 2016-12-09 06:08:45 -05:00
parent 142694ca0f
commit bb246e5514
1 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
chrome/content/zotero/xpcom/itemTreeView.js
View file

@ -1748,23 +1748,7 @@ Zotero.ItemTreeView.prototype.selectItem = Zotero.Promise.coroutine(function* (i
yield deferred.promise; yield deferred.promise;
} }
// We aim for a row 5 below the target row, since ensureRowIsVisible() does this.betterEnsureRowIsVisible(row, parentRow);
// the bare minimum to get the row in view
for (var v = row + 5; v>=row; v--) {
if (this._rows[v]) {
this._treebox.ensureRowIsVisible(v);
if (this._treebox.getFirstVisibleRow() <= row) {
break;
}
}
}
// If the parent row isn't in view and we have enough room, make parent visible
if (parentRow !== null && this._treebox.getFirstVisibleRow() > parentRow) {
if ((row - parentRow) < this._treebox.getPageLength()) {
this._treebox.ensureRowIsVisible(parentRow);
}
}
return true; return true;
}); });
@ -1801,9 +1785,32 @@ Zotero.ItemTreeView.prototype.selectItems = function(ids) {
} }
this.selection.selectEventsSuppressed = false; this.selection.selectEventsSuppressed = false;
// TODO: This could probably be improved to try to focus more of the selected rows
this.betterEnsureRowIsVisible(rows[0]);
} }
Zotero.ItemTreeView.prototype.betterEnsureRowIsVisible = function (row, parentRow = null) {
// We aim for a row 5 below the target row, since ensureRowIsVisible() does
// the bare minimum to get the row in view
for (let v = row + 5; v >= row; v--) {
if (this._rows[v]) {
this._treebox.ensureRowIsVisible(v);
if (this._treebox.getFirstVisibleRow() <= row) {
break;
}
}
}
// If the parent row isn't in view and we have enough room, make parent visible
if (parentRow !== null && this._treebox.getFirstVisibleRow() > parentRow) {
if ((row - parentRow) < this._treebox.getPageLength()) {
this._treebox.ensureRowIsVisible(parentRow);
}
}
};
/* /*
* Return an array of Item objects for selected items * Return an array of Item objects for selected items
* *