Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Comments

Browse source
This commit is contained in:
Zach Fox 2017-01-20 10:21:18 -08:00
parent 9c9206acc0
commit 8f3c4794c6
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/resources/qml/hifi/Pal.qml
View file

@ -416,9 +416,11 @@ Rectangle {
} }
} }
} }
// Timer used when selecting table rows that aren't yet present in the model
// (i.e. when selecting avatars using edit.js or sphere overlays)
Timer { Timer {
property var selected property bool selected // Selected or deselected?
property int userIndex property int userIndex // The userIndex of the avatar we want to select
id: selectionTimer id: selectionTimer
onTriggered: { onTriggered: {
if (selected) { if (selected) {
@ -472,15 +474,20 @@ Rectangle {
if (sessionIds.length > 1) { if (sessionIds.length > 1) {
letterbox("", "", 'Only one user can be selected at a time.'); letterbox("", "", 'Only one user can be selected at a time.');
} else if (userIndex < 0) { } else if (userIndex < 0) {
// If we've already refreshed the PAL and the avatar still isn't present in the model...
if (alreadyRefreshed === true) { if (alreadyRefreshed === true) {
letterbox('', '', 'The last editor of this object is either you or not among this list of users.'); letterbox('', '', 'The last editor of this object is either you or not among this list of users.');
} else { } else {
pal.sendToScript({method: 'refresh', params: message.params}); pal.sendToScript({method: 'refresh', params: message.params});
} }
} else { } else {
// If we've already refreshed the PAL and found the avatar in the model
if (alreadyRefreshed === true) { if (alreadyRefreshed === true) {
// Wait a little bit before trying to actually select the avatar in the table
selectionTimer.interval = 250; selectionTimer.interval = 250;
} else { } else {
// If we've found the avatar in the model and didn't need to refresh,
// select the avatar in the table immediately
selectionTimer.interval = 0; selectionTimer.interval = 0;
} }
selectionTimer.selected = selected; selectionTimer.selected = selected;