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

Finalize work on MS14295 and MS14559

Browse source
This commit is contained in:
Zach Fox 2018-04-27 11:04:46 -07:00
parent c163ae63b8
commit 684d2b08ba
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/resources/qml/hifi/commerce/common/sendAsset/SendAsset.qml
View file

@ -1308,7 +1308,7 @@ Item {
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: root.assetName === "" ? 15 : 50; anchors.rightMargin: root.assetName === "" ? 15 : 50;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: root.assetName === "" ? 15 : 300; anchors.bottomMargin: root.assetName === "" ? 15 : 240;
color: "#FFFFFF"; color: "#FFFFFF";
RalewaySemiBold { RalewaySemiBold {
@ -1403,12 +1403,12 @@ Item {
id: giftContainer_paymentSuccess; id: giftContainer_paymentSuccess;
visible: root.assetName !== ""; visible: root.assetName !== "";
anchors.top: sendToContainer_paymentSuccess.bottom; anchors.top: sendToContainer_paymentSuccess.bottom;
anchors.topMargin: 16; anchors.topMargin: 8;
anchors.left: parent.left; anchors.left: parent.left;
anchors.leftMargin: 20; anchors.leftMargin: 20;
anchors.right: parent.right; anchors.right: parent.right;
anchors.rightMargin: 20; anchors.rightMargin: 20;
height: 80; height: 30;
RalewaySemiBold { RalewaySemiBold {
id: gift_paymentSuccess; id: gift_paymentSuccess;
@ -1431,6 +1431,7 @@ Item {
anchors.top: parent.top; anchors.top: parent.top;
anchors.left: gift_paymentSuccess.right; anchors.left: gift_paymentSuccess.right;
anchors.right: parent.right; anchors.right: parent.right;
height: parent.height;
// Text size // Text size
size: 18; size: 18;
// Style // Style
@ -1522,7 +1523,7 @@ Item {
colorScheme: root.assetName === "" ? hifi.colorSchemes.dark : hifi.colorSchemes.light; colorScheme: root.assetName === "" ? hifi.colorSchemes.dark : hifi.colorSchemes.light;
anchors.horizontalCenter: parent.horizontalCenter; anchors.horizontalCenter: parent.horizontalCenter;
anchors.bottom: parent.bottom; anchors.bottom: parent.bottom;
anchors.bottomMargin: 80; anchors.bottomMargin: root.assetName === "" ? 80 : 30;
height: 50; height: 50;
width: 120; width: 120;
text: "Close"; text: "Close";

12
scripts/system/commerce/wallet.js
View file

@ -557,12 +557,14 @@
} }
if (onWalletScreen) { if (onWalletScreen) {
if (!isWired) {
Users.usernameFromIDReply.connect(usernameFromIDReply);
Controller.mousePressEvent.connect(handleMouseEvent);
Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
triggerMapping.enable();
triggerPressMapping.enable();
}
isWired = true; isWired = true;
Users.usernameFromIDReply.connect(usernameFromIDReply);
Controller.mousePressEvent.connect(handleMouseEvent);
Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
triggerMapping.enable();
triggerPressMapping.enable();
} else { } else {
off(); off();
} }

12
scripts/system/marketplaces/marketplaces.js
View file

@ -1055,12 +1055,14 @@ var selectionDisplay = null; // for gridTool.js to ignore
} }
if (onCommerceScreen) { if (onCommerceScreen) {
if (!isWired) {
Users.usernameFromIDReply.connect(usernameFromIDReply);
Controller.mousePressEvent.connect(handleMouseEvent);
Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
triggerMapping.enable();
triggerPressMapping.enable();
}
isWired = true; isWired = true;
Users.usernameFromIDReply.connect(usernameFromIDReply);
Controller.mousePressEvent.connect(handleMouseEvent);
Controller.mouseMoveEvent.connect(handleMouseMoveEvent);
triggerMapping.enable();
triggerPressMapping.enable();
Wallet.refreshWalletStatus(); Wallet.refreshWalletStatus();
} else { } else {
off(); off();