Merge pull request #8382 from ctrlaltdavid/21024

Disable Asset Browser's right-click popup menu if in HMD mode
This commit is contained in:
Brad Hefta-Gaub 2016-08-09 12:41:48 -07:00 committed by GitHub
commit 1834b035d7

View file

@ -521,14 +521,15 @@ ScrollingWindow {
anchors.fill: parent
acceptedButtons: Qt.RightButton
onClicked: {
var index = treeView.indexAt(mouse.x, mouse.y);
treeView.selection.setCurrentIndex(index, 0x0002);
contextMenu.currentIndex = index;
contextMenu.popup();
if (!HMD.active) { // Popup only displays properly on desktop
var index = treeView.indexAt(mouse.x, mouse.y);
treeView.selection.setCurrentIndex(index, 0x0002);
contextMenu.currentIndex = index;
contextMenu.popup();
}
}
}
}
HifiControls.ContentSection {
id: uploadSection