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

25% opacity from PM req/fixing error message in profile body

Browse source
This commit is contained in:
Wayne Chen 2018-12-05 19:42:44 -08:00
parent a3a575acd1
commit f8a55a9196
5 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/LoginDialog.qml
View file

@ -63,7 +63,7 @@ FocusScope {
id: opaqueRect
height: parent.height
width: parent.width
opacity: 0.5
opacity: 0.25
color: "black"
}

50
interface/resources/qml/LoginDialog/CompleteProfileBody.qml
View file

@ -61,23 +61,39 @@ Item {
id: contentItem
anchors.fill: parent
TextMetrics {
id: loginErrorMessageTextMetrics
font: loginErrorMessage.font
text: loginErrorMessage.text
}
Text {
id: loginErrorMessage
anchors.top: parent.top;
// above buttons.
anchors.topMargin: (parent.height - additionalTextContainer.height) / 2 - hifi.dimensions.contentSpacing.y - profileButton.height
anchors.left: parent.left;
anchors.leftMargin: (parent.width - loginErrorMessageTextMetrics.width) / 2;
color: "red";
font.family: completeProfileBody.fontFamily
font.pixelSize: completeProfileBody.fontSize
text: completeProfileBody.errorString
visible: true
Item {
id: errorContainer
width: parent.width
height: loginErrorMessageTextMetrics.height
anchors {
bottom: buttons.top;
bottomMargin: hifi.dimensions.contentSpacing.y;
left: buttons.left;
}
TextMetrics {
id: loginErrorMessageTextMetrics
font: loginErrorMessage.font
text: loginErrorMessage.text
}
Text {
id: loginErrorMessage;
width: root.bannerWidth
color: "red";
font.family: signUpBody.fontFamily
font.pixelSize: 18
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter
text: completeProfileBody.errorString
visible: true
}
Component.onCompleted: {
if (loginErrorMessageTextMetrics.width > 350 && root.isTablet) {
loginErrorMessage.wrapMode = Text.WordWrap;
loginErrorMessage.verticalAlignment = Text.AlignLeft;
loginErrorMessage.horizontalAlignment = Text.AlignLeft;
errorContainer.height = 2 * loginErrorMessageTextMetrics.height;
}
}
}
Item {

5
interface/resources/qml/LoginDialog/LinkAccountBody.qml
View file

@ -474,7 +474,7 @@ Item {
onFocusEnabled: {
Qt.callLater(function() {
emailField.forceActiveFocus();
})
});
}
}
@ -485,6 +485,9 @@ Item {
root.text = "";
d.resize();
init();
Qt.callLater(function() {
emailField.forceActiveFocus();
});
}
Keys.onPressed: {

2
interface/resources/qml/OverlayLoginDialog.qml
View file

@ -64,7 +64,7 @@ FocusScope {
id: opaqueRect
height: parent.height
width: parent.width
opacity: 0.5
opacity: 0.25
color: "black"
}

2
interface/resources/qml/dialogs/TabletLoginDialog.qml
View file

@ -120,7 +120,7 @@ FocusScope {
id: opaqueRect
height: parent.height
width: parent.width
opacity: 0.5
opacity: 0.25
color: "black"
}