mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Merge pull request #1155 from Armored-Dragon/fix/avatarAppIconIssues
[ Avatar App ] Fixed lingering references to now deleted QML element
This commit is contained in:
commit
af1306b8b1
2 changed files with 3 additions and 6 deletions
|
@ -238,7 +238,6 @@ Rectangle {
|
|||
}
|
||||
|
||||
pageTitle: currentPage
|
||||
avatarIconVisible: mainPageVisible
|
||||
settingsButtonVisible: mainPageVisible
|
||||
onSettingsClicked: {
|
||||
displayNameInput.focus = false;
|
||||
|
|
|
@ -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,9 +23,8 @@ 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'
|
||||
}
|
||||
|
||||
|
@ -34,7 +32,7 @@ ShadowRectangle {
|
|||
id: settingsButton
|
||||
anchors.right: parent.right
|
||||
anchors.rightMargin: 30
|
||||
anchors.verticalCenter: avatarIcon.verticalCenter
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
text: "&"
|
||||
|
||||
MouseArea {
|
||||
|
|
Loading…
Reference in a new issue