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

invalidate avatar model on using custom avatar url

Browse source 
disable navigation if no marketId
This commit is contained in:
Alexander Ivash 2018-05-25 23:28:36 +03:00
parent dbf1aa779a
commit 345c294d47
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -73,6 +73,8 @@ Rectangle {
} }
function getAvatarModelName() { function getAvatarModelName() {
console.debug('executing getAvatarModelName()');
if(currentAvatar === null) { if(currentAvatar === null) {
return ''; return '';
} }
@ -85,7 +87,7 @@ Rectangle {
} }
} }
var avatarUrl = currentAvatar.entry.avatarUrl; var avatarUrl = currentAvatar.avatarUrl;
var splitted = avatarUrl.split('/'); var splitted = avatarUrl.split('/');
return splitted[splitted.length - 1]; return splitted[splitted.length - 1];
@ -129,6 +131,8 @@ Rectangle {
console.debug('externalAvatarApplied...'); console.debug('externalAvatarApplied...');
currentAvatar.avatarUrl = message.avatarURL; currentAvatar.avatarUrl = message.avatarURL;
currentAvatar.thumbnailUrl = allAvatars.makeThumbnailUrl(message.avatarURL); currentAvatar.thumbnailUrl = allAvatars.makeThumbnailUrl(message.avatarURL);
currentAvatar.entry.avatarUrl = currentAvatar.avatarUrl;
currentAvatar.modelName = undefined;
console.debug('externalAvatarApplied: ', currentAvatar.avatarUrl, currentAvatar.thumbnailUrl); console.debug('externalAvatarApplied: ', currentAvatar.avatarUrl, currentAvatar.thumbnailUrl);
updateCurrentAvatarInBookmarks(currentAvatar); updateCurrentAvatarInBookmarks(currentAvatar);
} else if(message.method === 'settingChanged') { } else if(message.method === 'settingChanged') {
@ -457,13 +461,20 @@ Rectangle {
id: avatarNameLabel id: avatarNameLabel
text: { text: {
var avatarName = getAvatarModelName(); var avatarName = getAvatarModelName();
console.debug('getAvatarModelName() returned: ', avatarName)
return avatarName.length <= 14 ? avatarName : avatarName.substring(0, 14) + '...' return avatarName.length <= 14 ? avatarName : avatarName.substring(0, 14) + '...'
} }
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 30 anchors.leftMargin: 30
anchors.top: star.bottom anchors.top: star.bottom
anchors.topMargin: 11 anchors.topMargin: 11
property bool hasMarketId: currentAvatar && allAvatars.extractMarketId(currentAvatar.avatarUrl) !== '';
onHasMarketIdChanged: {
console.debug('hasMarketId: ', hasMarketId, currentAvatar.avatarUrl);
}
MouseArea { MouseArea {
enabled: avatarNameLabel.hasMarketId
anchors.fill: parent; anchors.fill: parent;
onClicked: emitSendToScript({'method' : 'navigate', 'url' : allAvatars.makeMarketItemUrl(currentAvatar.avatarUrl)}) onClicked: emitSendToScript({'method' : 'navigate', 'url' : allAvatars.makeMarketItemUrl(currentAvatar.avatarUrl)})
} }