Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixes

Browse source
This commit is contained in:
Zach Fox 2017-08-15 15:36:28 -07:00
parent d376630bde
commit 29a9ae28e9
2 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/hifi/commerce/Inventory.qml
View file

@ -44,7 +44,7 @@ Rectangle {
}
}
onSecurityImageResult: {
securityImage.source = imageID ? gridModel.get(imageID - 1).sourcePath : "";
securityImage.source = securityImageSelection.getImagePathFromImageID(imageID);
}
}
@ -52,9 +52,6 @@ Rectangle {
id: securityImageSelection;
referrerURL: inventoryRoot.referrerURL;
}
SecurityImageModel {
id: gridModel;
}
//
// TITLE BAR START

17
interface/resources/qml/hifi/commerce/SecurityImageSelection.qml
View file

@ -26,7 +26,6 @@ Rectangle {
id: securityImageSelectionRoot;
property string referrerURL: "";
property bool isManuallyChangingSecurityImage: false;
property int imageEnumValue: 0;
anchors.fill: parent;
// Style
color: hifi.colors.baseGray;
@ -39,13 +38,12 @@ Rectangle {
if (!isManuallyChangingSecurityImage) {
securityImageSelectionRoot.visible = (imageID == 0);
}
if (imageID !== 0) {
if (imageID > 0) {
for (var itr = 0; itr < gridModel.count; itr++) {
var thisValue = gridModel.get(itr).securityImageEnumValue;
if (thisValue === imageID) {
securityImageSelectionRoot.imageEnumValue = thisValue;
securityImageGrid.currentIndex = itr;
return;
break;
}
}
}
@ -182,16 +180,9 @@ Rectangle {
}
MouseArea {
anchors.fill: parent;
hoverEnabled: enabled;
onClicked: {
securityImageGrid.currentIndex = index;
}
onEntered: {
//thisItemId.color = hifi.colors.blueHighlight;
}
onExited: {
//thisItemId.color = hifi.colors.blueAccent;
}
}
}
highlight: Rectangle {
@ -268,6 +259,10 @@ Rectangle {
// FUNCTION DEFINITIONS START
//
signal sendToScript(var message);
function getImagePathFromImageID(imageID) {
return (imageID ? gridModel.get(imageID - 1).sourcePath : "");
}
//
// FUNCTION DEFINITIONS END
//