Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move security image to top left

Browse source
This commit is contained in:
Zach Fox 2017-08-15 16:24:14 -07:00
parent ccf2d71036
commit 5c157a7397
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
interface/resources/qml/hifi/commerce/Checkout.qml
View file

@ -88,6 +88,19 @@ Rectangle {
anchors.left: parent.left;
anchors.top: parent.top;
// Security Image
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.left: parent.left;
anchors.leftMargin: 16;
height: parent.height - 5;
width: height;
anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit;
}
// Title Bar text
RalewaySemiBold {
id: titleBarText;
@ -96,7 +109,7 @@ Rectangle {
size: hifi.fontSizes.overlayTitle;
// Anchors
anchors.top: parent.top;
anchors.left: parent.left;
anchors.left: securityImage.right;
anchors.leftMargin: 16;
anchors.bottom: parent.bottom;
width: paintedWidth;
@ -107,19 +120,6 @@ Rectangle {
verticalAlignment: Text.AlignVCenter;
}
// Security Image
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.left: titleBarText.right;
anchors.leftMargin: 16;
height: parent.height - 5;
width: height;
anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit;
}
// Separator
HifiControlsUit.Separator {
anchors.left: parent.left;

28
interface/resources/qml/hifi/commerce/Inventory.qml
View file

@ -65,6 +65,19 @@ Rectangle {
anchors.left: parent.left;
anchors.top: parent.top;
// Security Image
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.left: parent.left;
anchors.leftMargin: 16;
height: parent.height - 5;
width: height;
anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit;
}
// Title Bar text
RalewaySemiBold {
id: titleBarText;
@ -73,7 +86,7 @@ Rectangle {
size: hifi.fontSizes.overlayTitle;
// Anchors
anchors.top: parent.top;
anchors.left: parent.left;
anchors.left: securityImage.right;
anchors.leftMargin: 16;
anchors.bottom: parent.bottom;
width: paintedWidth;
@ -84,19 +97,6 @@ Rectangle {
verticalAlignment: Text.AlignVCenter;
}
// Security Image
Image {
id: securityImage;
// Anchors
anchors.top: parent.top;
anchors.left: titleBarText.right;
anchors.leftMargin: 16;
height: parent.height - 5;
width: height;
anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit;
}
// "Change Security Image" button
HifiControlsUit.Button {
id: changeSecurityImageButton;