From ef4265de4bbcb70bbb5db1a1e5336b0b2143d55e Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 17 Jul 2018 16:16:43 -0700 Subject: [PATCH 1/2] Fix MS16802: In Purchases, there shouldn't be a glyph associated with the Open button --- .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml index 13dc3cb37f..0935f27388 100644 --- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml +++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml @@ -731,7 +731,7 @@ Item { } HiFiGlyphs { id: rezIcon; - text: (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)]; + text: root.isInstalled ? "" : (root.buttonGlyph)[itemTypesArray.indexOf(root.itemType)]; anchors.right: rezIconLabel.left; anchors.rightMargin: 2; anchors.verticalCenter: parent.verticalCenter; @@ -750,7 +750,7 @@ Item { text: root.isInstalled ? "OPEN" : (MyAvatar.skeletonModelURL === root.itemHref ? "CURRENT" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]); anchors.verticalCenter: parent.verticalCenter; width: rezIconLabelTextMetrics.width; - x: parent.width/2 - rezIconLabelTextMetrics.width/2 + rezIconTextMetrics.width/2; + x: parent.width/2 - rezIconLabelTextMetrics.width/2 + (rezIcon.text === "" ? 0 : rezIconTextMetrics.width/2); size: 15; font.capitalization: Font.AllUppercase; verticalAlignment: Text.AlignVCenter; From 919bfce7abbcbe8bbdff17e8cf42c1d5cc451fdc Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 18 Jul 2018 09:00:01 -0700 Subject: [PATCH 2/2] Simplify --- .../resources/qml/hifi/commerce/purchases/PurchasedItem.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml index 0935f27388..b2338d08de 100644 --- a/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml +++ b/interface/resources/qml/hifi/commerce/purchases/PurchasedItem.qml @@ -750,7 +750,7 @@ Item { text: root.isInstalled ? "OPEN" : (MyAvatar.skeletonModelURL === root.itemHref ? "CURRENT" : (root.buttonTextNormal)[itemTypesArray.indexOf(root.itemType)]); anchors.verticalCenter: parent.verticalCenter; width: rezIconLabelTextMetrics.width; - x: parent.width/2 - rezIconLabelTextMetrics.width/2 + (rezIcon.text === "" ? 0 : rezIconTextMetrics.width/2); + x: parent.width/2 - rezIconLabelTextMetrics.width/2 + rezIconTextMetrics.width/2; size: 15; font.capitalization: Font.AllUppercase; verticalAlignment: Text.AlignVCenter;