diff --git a/interface/resources/qml/hifi/avatarapp/MessageBox.qml b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
index c5711fe1ce..94dd45c125 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBox.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
@@ -85,16 +85,9 @@ Rectangle {
text: root.titleText
}
- Item {
+ Column {
id: contentContainer
- width: parent.width - 60
- height: childrenRect.height
- onHeightChanged: {
- console.debug('contentContainer: height = ', height,
- 'image.height = ', image.height,
- 'body.height = ', body.height
- )
- }
+ spacing: 15
anchors.top: title.bottom
anchors.topMargin: 10
@@ -103,9 +96,25 @@ Rectangle {
anchors.right: parent.right;
anchors.rightMargin: 30;
+ InputTextStyle4 {
+ id: input
+ visible: false
+ height: visible ? implicitHeight : 0
+
+ anchors.left: parent.left;
+ anchors.right: parent.right;
+ }
+
TextStyle3 {
- id: body;
+ id: body
+
+ AvatarAppStyle {
+ id: style
+ }
+
+ size: 18
text: root.bodyText;
+ linkColor: style.colors.blueHighlight
anchors.left: parent.left;
anchors.right: parent.right;
height: paintedHeight;
@@ -125,8 +134,6 @@ Rectangle {
value: 0
}
- anchors.top: body.bottom
- anchors.topMargin: imageSource === null ? 0 : 30
anchors.left: parent.left;
anchors.right: parent.right;
@@ -137,16 +144,6 @@ Rectangle {
visible: imageSource !== null ? true : false
}
-
- InputTextStyle4 {
- id: input
- visible: false
- height: visible ? implicitHeight : 0
-
- anchors.top: imageSource !== null ? image.bottom : body.bottom
- anchors.left: parent.left;
- anchors.right: parent.right;
- }
}
DialogButtons {
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
index 7d25638dcd..f0e25433d7 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@@ -6,11 +6,12 @@ MessageBox {
function showSpecifyAvatarUrl(callback, linkCallback) {
popup.onButton2Clicked = callback;
popup.titleText = 'Specify Avatar URL'
- popup.bodyText = 'If you want to add a custom avatar, you can specify the URL of the avatar file' +
- '(“.fst” extension) here. Learn to make a custom avatar by opening this link on your desktop.'
+ popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.
' +
+ '' +
+ 'Learn to make a custom avatar by opening this link on your desktop.' +
+ ''
popup.inputText.visible = true;
popup.inputText.placeholderText = 'Enter Avatar Url';
- popup.inputText.forceActiveFocus();
popup.button1text = 'CANCEL';
popup.button2text = 'CONFIRM';
@@ -27,6 +28,7 @@ MessageBox {
}
popup.open();
+ popup.inputText.forceActiveFocus();
}
property url getWearablesUrl: '../../../images/avatarapp/AvatarIsland.jpg'