Merge branch 'master' of https://github.com/highfidelity/hifi into black

This commit is contained in:
samcake 2017-08-15 09:22:30 -07:00
commit 3a61bc974d

View file

@ -27,6 +27,7 @@ TreeView {
model: treeModel
selection: ItemSelectionModel {
id: selectionModel
model: treeModel
}
@ -215,6 +216,10 @@ TreeView {
onDoubleClicked: isExpanded(index) ? collapse(index) : expand(index)
onClicked: {
selectionModel.setCurrentIndex(index, ItemSelectionModel.ClearAndSelect);
}
onActivated: {
var path = scriptsModel.data(index, 0x100)
if (path) {