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

rework avatar selection logic based on changed requirements: selecte avatar always goes to the beginning of the list, selected page auto-switches to the first one

Browse source
This commit is contained in:
Alexander Ivash 2018-04-27 22:33:21 +03:00
parent bdacd1b792
commit 8a5abb32a7
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -22,6 +22,10 @@ Rectangle {
console.debug('selectedAvatar: ', selectedAvatar ? selectedAvatar.url : selectedAvatar) console.debug('selectedAvatar: ', selectedAvatar ? selectedAvatar.url : selectedAvatar)
} }
function isEqualById(avatar, avatarId) {
return (avatar.url + avatar.name) === avatarId
}
property string avatarName: selectedAvatar ? selectedAvatar.name : '' property string avatarName: selectedAvatar ? selectedAvatar.name : ''
property string avatarUrl: selectedAvatar ? selectedAvatar.url : null property string avatarUrl: selectedAvatar ? selectedAvatar.url : null
property int avatarWearablesCount: selectedAvatar && selectedAvatar.wearables !== '' ? selectedAvatar.wearables.split('|').length : 0 property int avatarWearablesCount: selectedAvatar && selectedAvatar.wearables !== '' ? selectedAvatar.wearables.split('|').length : 0
@ -39,11 +43,7 @@ Rectangle {
} }
} }
selectedAvatarId = allAvatars.get(0).url view.selectAvatar(allAvatars.get(1));
console.debug('wearables: ', selectedAvatar.wearables)
view.setPage(0)
console.debug('view.currentIndex: ', view.currentIndex);
} }
AvatarAppStyle { AvatarAppStyle {
@ -347,20 +347,35 @@ Rectangle {
property int horizontalSpacing: 18 property int horizontalSpacing: 18
property int verticalSpacing: 36 property int verticalSpacing: 36
function selectAvatar(avatar) {
selectedAvatarId = avatar.url + avatar.name;
var avatarIndex = allAvatars.findAvatarIndex(selectedAvatarId);
allAvatars.move(avatarIndex, 0, 1);
view.setPage(0);
}
AvatarsModel { AvatarsModel {
id: allAvatars id: allAvatars
function findAvatarIndex(avatarId) {
for(var i = 0; i < count; ++i) {
if(isEqualById(get(i), avatarId)) {
console.debug('avatar found by index: ', i)
return i;
}
}
return -1;
}
function findAvatar(avatarId) { function findAvatar(avatarId) {
console.debug('AvatarsModel: find avatar by', avatarId); console.debug('AvatarsModel: find avatar by', avatarId);
for(var i = 0; i < count; ++i) { var avatarIndex = findAvatarIndex(avatarId);
if(get(i).url === avatarId) { if(avatarIndex === -1)
console.debug('avatar found by index: ', i) return undefined;
return get(i);
}
}
return -1; return get(avatarIndex);
} }
} }
@ -418,7 +433,7 @@ Rectangle {
console.debug('pageOfAvatars.findAvatar: ', avatarId); console.debug('pageOfAvatars.findAvatar: ', avatarId);
for(var i = 0; i < count; ++i) { for(var i = 0; i < count; ++i) {
if(get(i).url === avatarId) { if(isEqualById(get(i), avatarId)) {
console.debug('avatar found by index: ', i) console.debug('avatar found by index: ', i)
return i; return i;
} }
@ -540,11 +555,8 @@ Rectangle {
popup.bodyText = 'This will switch your current avatar and ararables that you are wearing with a new avatar and wearables.' popup.bodyText = 'This will switch your current avatar and ararables that you are wearing with a new avatar and wearables.'
popup.imageSource = null; popup.imageSource = null;
popup.onButton2Clicked = function() { popup.onButton2Clicked = function() {
selectedAvatarId = currentItem.url;
popup.close(); popup.close();
view.selectAvatar(currentItem);
pageOfAvatars.move(index, 0, 1);
delegateRoot.GridView.view.currentIndex = 0;
} }
popup.open(); popup.open();
} }