From 5c157a73975a1737561622346beaf52333e3f77b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 15 Aug 2017 16:24:14 -0700 Subject: [PATCH] Move security image to top left --- .../resources/qml/hifi/commerce/Checkout.qml | 28 +++++++++---------- .../resources/qml/hifi/commerce/Inventory.qml | 28 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/Checkout.qml b/interface/resources/qml/hifi/commerce/Checkout.qml index 2b0cae78bb..c7b5b080d0 100644 --- a/interface/resources/qml/hifi/commerce/Checkout.qml +++ b/interface/resources/qml/hifi/commerce/Checkout.qml @@ -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; diff --git a/interface/resources/qml/hifi/commerce/Inventory.qml b/interface/resources/qml/hifi/commerce/Inventory.qml index 5eb2b7865e..488efb3872 100644 --- a/interface/resources/qml/hifi/commerce/Inventory.qml +++ b/interface/resources/qml/hifi/commerce/Inventory.qml @@ -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;