Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 13:49:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed conflict and spacing

Browse source
This commit is contained in:
Preston Bezos 2019-06-26 09:12:32 -07:00
parent 1481c7424f
commit bd3fe8a092
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
View file

@ -163,7 +163,7 @@ Rectangle {
Item { Item {
width: parent.width width: parent.width
height: parent.height-parent.height*level height: parent.height - parent.height * level
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
clip:true clip:true

9
interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml
View file

@ -47,6 +47,12 @@ Rectangle {
onSkeletonModelURLChanged: { onSkeletonModelURLChanged: {
root.updatePreviewUrl(); root.updatePreviewUrl();
if ((MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) &&
topBarInventoryModel.count > 0) {
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
}
} }
} }
@ -95,7 +101,8 @@ Rectangle {
inventoryFullyReceived = true; inventoryFullyReceived = true;
// If we have an avatar in our inventory AND we haven't already auto-selected an avatar... // If we have an avatar in our inventory AND we haven't already auto-selected an avatar...
if (!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) && topBarInventoryModel.count > 0) { if ((!Settings.getValue("simplifiedUI/alreadyAutoSelectedAvatar", false) ||
MyAvatar.skeletonModelURL.indexOf("defaultAvatar") > -1 || MyAvatar.skeletonModelURL.indexOf("fst") === -1) && topBarInventoryModel.count > 0) {
Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true); Settings.setValue("simplifiedUI/alreadyAutoSelectedAvatar", true);
MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url; MyAvatar.skeletonModelURL = topBarInventoryModel.get(0).download_url;
} }