Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 14:11:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add updates; drop shadow

Browse source
This commit is contained in:
Zach Fox 2018-03-13 12:13:14 -07:00
parent bce7fb1ff1
commit 50e709c738
2 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
interface/resources/qml/controls-uit/FilterBar.qml
View file

@ -11,6 +11,7 @@
import QtQuick 2.5
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
import "../styles-uit"
import "../controls-uit" as HifiControls
@ -27,7 +28,7 @@ Item {
property alias dropdownHeight: dropdownContainer.height;
property alias text: textField.text;
property alias primaryFilterChoices: filterBarModel;
property alias textFieldFocused: textField.focus;
property alias textFieldFocused: textField.activeFocus;
property int primaryFilter_index: -1;
property string primaryFilter_filterName: "";
property string primaryFilter_displayName: "";
@ -290,4 +291,15 @@ Item {
}
}
}
DropShadow {
anchors.fill: dropdownContainer;
horizontalOffset: 0;
verticalOffset: 4;
radius: 4.0;
samples: 9
color: Qt.rgba(0, 0, 0, 0.25);
source: dropdownContainer;
visible: dropdownContainer.visible;
}
}

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

@ -356,6 +356,10 @@ Rectangle {
{
"displayName": "Wearable",
"filterName": "wearable"
},
{
"displayName": "Updatable",
"filterName": "updatable"
}
]
filterBar.primaryFilterChoices.clear();
@ -709,8 +713,9 @@ Rectangle {
currentItemType = "unknown";
}
if (filterBar.primaryFilter_filterName !== "" &&
currentItemType.toLowerCase() !== filterBar.primaryFilter_filterName.toLowerCase()) {
if (filterBar.primaryFilter_displayName !== "" &&
(filterBar.primaryFilter_displayName.toLowerCase() !== currentItemType.toLowerCase())) { //|| UNCOMMENT WHEN UPGRADES ARE IN
//(filterBar.primaryFilter_displayName === "Updatable" && tempPurchasesModel.get(i).upgradeUrl !== "")) {
tempPurchasesModel.remove(i);
i--;
} else {