Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-07 04:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

The new layout from zeplin (https://zpl.io/aMm76Yr)

Browse source
This commit is contained in:
Alexander Ivash 2018-06-01 00:39:31 +03:00
parent 46992f04ad
commit 8d921b123d
2 changed files with 24 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
interface/resources/qml/hifi/avatarapp/MessageBox.qml
View file

@ -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 {

8
interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
View file

@ -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. <a href="https://docs.highfidelity.com/create-and-explore/avatars/create-avatars">Learn to make a custom avatar by opening this link on your desktop.</a>'
popup.bodyText = 'This will not overwrite your existing favorite if you are wearing one.<br>' +
'<a href="https://docs.highfidelity.com/create-and-explore/avatars/create-avatars">' +
'Learn to make a custom avatar by opening this link on your desktop.' +
'</a>'
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'