Merge pull request #1155 from Armored-Dragon/fix/avatarAppIconIssues

[ Avatar App ] Fixed lingering references to now deleted QML element
overte-org · Oct 5, 2024 · af1306b · af1306b
2 parents 2824067 + 9a989e5
commit af1306b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/interface/resources/qml/hifi/AvatarApp.qml b/interface/resources/qml/hifi/AvatarApp.qml
@@ -238,7 +238,6 @@ Rectangle {
         }
 
         pageTitle: currentPage
-        avatarIconVisible: mainPageVisible
         settingsButtonVisible: mainPageVisible
         onSettingsClicked: {
             displayNameInput.focus = false;

diff --git a/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml b/interface/resources/qml/hifi/avatarapp/AvatarAppHeader.qml
@@ -9,7 +9,6 @@ ShadowRectangle {
     height: 60
 
     property alias pageTitle: title.text
-    property alias avatarIconVisible: avatarIcon.visible
     property alias settingsButtonVisible: settingsButton.visible
 
     signal settingsClicked;
@@ -24,17 +23,16 @@ ShadowRectangle {
     RalewaySemiBold {
         id: title
         size: 22;
-        anchors.left: avatarIcon.visible ? avatarIcon.right : avatarIcon.left
-        anchors.leftMargin: 4
-        anchors.verticalCenter: avatarIcon.verticalCenter
+        x: 20
+        anchors.verticalCenter: parent.verticalCenter
         text: 'Avatar'
     }
 
     HiFiGlyphs {
         id: settingsButton
         anchors.right: parent.right
         anchors.rightMargin: 30
-        anchors.verticalCenter: avatarIcon.verticalCenter
+        anchors.verticalCenter: parent.verticalCenter
         text: "&"
 
         MouseArea {