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

Bugfixes per QA

Browse source
This commit is contained in:
Zach Fox 2018-04-16 11:53:37 -07:00
parent ee9519bf1b
commit 02aa8ac566
3 changed files with 27 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1121,7 +1121,7 @@ Item {
anchors.topMargin: 16;
anchors.left: parent.left;
anchors.leftMargin: 20;
width: 110;
width: 130;
boxSize: 28;
onCheckedChanged: {
Settings.setValue("sendAssetsNearbyPublicly", checked);
@ -1133,7 +1133,6 @@ Item {
text: "[?]";
// Anchors
anchors.left: sendPubliclyCheckbox.right;
anchors.leftMargin: 8;
anchors.verticalCenter: sendPubliclyCheckbox.verticalCenter;
height: 30;
width: paintedWidth;

1
interface/resources/qml/hifi/commerce/purchases/Purchases.qml
View file

@ -792,6 +792,7 @@ Rectangle {
HifiControlsUit.Keyboard {
id: keyboard;
z: 999;
raised: HMD.mounted && parent.keyboardRaised;
numeric: parent.punctuationMode;
anchors {

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

@ -1013,21 +1013,33 @@ var selectionDisplay = null; // for gridTool.js to ignore
});
break;
case 'refreshConnections':
print('Refreshing Connections...');
getConnectionData(false);
// Guard to prevent this code from being executed while sending money --
// we only want to execute this while sending non-HFC gifts
if (!onWalletScreen) {
print('Refreshing Connections...');
getConnectionData(false);
}
break;
case 'enable_ChooseRecipientNearbyMode':
if (!isUpdateOverlaysWired) {
Script.update.connect(updateOverlays);
isUpdateOverlaysWired = true;
// Guard to prevent this code from being executed while sending money --
// we only want to execute this while sending non-HFC gifts
if (!onWalletScreen) {
if (!isUpdateOverlaysWired) {
Script.update.connect(updateOverlays);
isUpdateOverlaysWired = true;
}
}
break;
case 'disable_ChooseRecipientNearbyMode':
if (isUpdateOverlaysWired) {
Script.update.disconnect(updateOverlays);
isUpdateOverlaysWired = false;
// Guard to prevent this code from being executed while sending money --
// we only want to execute this while sending non-HFC gifts
if (!onWalletScreen) {
if (isUpdateOverlaysWired) {
Script.update.disconnect(updateOverlays);
isUpdateOverlaysWired = false;
}
removeOverlays();
}
removeOverlays();
break;
case 'wallet_availableUpdatesReceived':
case 'purchases_availableUpdatesReceived':
@ -1191,18 +1203,19 @@ var selectionDisplay = null; // for gridTool.js to ignore
var isWired = false;
var isUpdateOverlaysWired = false;
function off() {
if (isWired) { // It is not ok to disconnect these twice, hence guard.
if (isWired) {
Users.usernameFromIDReply.disconnect(usernameFromIDReply);
Controller.mousePressEvent.disconnect(handleMouseEvent);
Controller.mouseMoveEvent.disconnect(handleMouseMoveEvent);
triggerMapping.disable();
triggerPressMapping.disable();
isWired = false;
}
if (isUpdateOverlaysWired) {
Script.update.disconnect(updateOverlays);
isUpdateOverlaysWired = false;
}
triggerMapping.disable(); // It's ok if we disable twice.
triggerPressMapping.disable(); // see above
removeOverlays();
}
function shutdown() {