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

Fix gray securityimage

Browse source
This commit is contained in:
Zach Fox 2017-09-29 14:30:02 -07:00
parent 63396a2fc3
commit bbbce96407
6 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/resources/qml/hifi/commerce/common/CommerceLightbox.qml
View file

@ -82,6 +82,7 @@ Rectangle {
height: 140; height: 140;
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
mipmap: true; mipmap: true;
cache: false;
} }
RalewayRegular { RalewayRegular {

1
interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
View file

@ -212,6 +212,7 @@ Item {
anchors.bottomMargin: 16; anchors.bottomMargin: 16;
width: height; width: height;
mipmap: true; mipmap: true;
cache: false;
MouseArea { MouseArea {
enabled: securityImage.visible; enabled: securityImage.visible;

1
interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
View file

@ -129,6 +129,7 @@ Item {
width: height; width: height;
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
mipmap: true; mipmap: true;
cache: false;
MouseArea { MouseArea {
enabled: titleBarSecurityImage.visible; enabled: titleBarSecurityImage.visible;

1
interface/resources/qml/hifi/commerce/wallet/SecurityImageSelection.qml
View file

@ -65,6 +65,7 @@ Item {
anchors.verticalCenter: parent.verticalCenter; anchors.verticalCenter: parent.verticalCenter;
fillMode: Image.PreserveAspectFit; fillMode: Image.PreserveAspectFit;
mipmap: true; mipmap: true;
cache: false;
} }
} }
MouseArea { MouseArea {

1
interface/resources/qml/hifi/commerce/wallet/Wallet.qml
View file

@ -140,6 +140,7 @@ Rectangle {
anchors.bottomMargin: 6; anchors.bottomMargin: 6;
width: height; width: height;
mipmap: true; mipmap: true;
cache: false;
MouseArea { MouseArea {
enabled: titleBarSecurityImage.visible; enabled: titleBarSecurityImage.visible;

5
interface/resources/qml/hifi/commerce/wallet/WalletSetup.qml
View file

@ -43,7 +43,7 @@ Item {
if (!exists && root.lastPage === "step_2") { if (!exists && root.lastPage === "step_2") {
// ERROR! Invalid security image. // ERROR! Invalid security image.
root.activeView = "step_2"; root.activeView = "step_2";
} else { } else if (exists) {
titleBarSecurityImage.source = ""; titleBarSecurityImage.source = "";
titleBarSecurityImage.source = "image://security/securityImage"; titleBarSecurityImage.source = "image://security/securityImage";
} }
@ -116,7 +116,7 @@ Item {
Image { Image {
id: titleBarSecurityImage; id: titleBarSecurityImage;
source: ""; source: "";
visible: !securityImageTip.visible && titleBarSecurityImage.source !== ""; visible: !securityImageTip.visible && titleBarSecurityImage.source !== "" && root.activeView !== "step_1" && root.activeView !== "step_2";
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 6; anchors.rightMargin: 6;
anchors.top: parent.top; anchors.top: parent.top;
@ -125,6 +125,7 @@ Item {
anchors.bottomMargin: 6; anchors.bottomMargin: 6;
width: height; width: height;
mipmap: true; mipmap: true;
cache: false;
MouseArea { MouseArea {
enabled: titleBarSecurityImage.visible; enabled: titleBarSecurityImage.visible;