Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 23:12:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace Row with ListView, but otherwise same user-functionality

Browse source
This commit is contained in:
howard-stearns 2016-07-28 15:01:21 -07:00
parent 17a5fa040d
commit ed811d0431
2 changed files with 34 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
interface/resources/qml/AddressBarDialog.qml
View file

@ -46,7 +46,7 @@ Window {
}
function goCard(card) {
addressLine.text = card.userStory.name;
addressLine.text = card.path;
toggleOrGo(true);
}
property var allDomains: [];
@ -60,32 +60,27 @@ Window {
implicitWidth: backgroundImage.width
implicitHeight: backgroundImage.height
Row {
width: backgroundImage.width;
ListModel { id: suggestions }
ListView {
width: (3 * cardWidth) + (2 * hifi.layout.spacing);
height: cardHeight;
spacing: hifi.layout.spacing;
anchors {
bottom: backgroundImage.top;
bottomMargin: 2 * hifi.layout.spacing;
right: backgroundImage.right;
rightMargin: -104; // FIXME
}
spacing: hifi.layout.spacing;
Card {
id: s0;
model: suggestions;
orientation: ListView.Horizontal;
delegate: Card {
width: cardWidth;
height: cardHeight;
goFunction: goCard
}
Card {
id: s1;
width: cardWidth;
height: cardHeight;
goFunction: goCard
}
Card {
id: s2;
width: cardWidth;
height: cardHeight;
goFunction: goCard
goFunction: goCard;
path: model.name;
thumbnail: model.thumbnail;
placeText: model.name;
usersText: model.online_users + ((model.online_users === 1) ? ' user' : ' users')
}
}
@ -225,6 +220,7 @@ Window {
function addPictureToDomain(domainInfo, cb) { // asynchronously add thumbnail and lobby to domainInfo, if available, and cb(error)
// This requests data for all the names at once, and just uses the first one to come back.
// We might change this to check one at a time, which would be less requests and more latency.
domainInfo.thumbnail = ''; // Regardless of whether we fill it in later, qt models must start with the all values they will have.
asyncEach([domainInfo.name].concat(domainInfo.names || null).filter(identity), function (name, icb) {
var url = "https://metaverse.highfidelity.com/api/v1/places/" + name;
getRequest(url, function (error, json) {
@ -280,17 +276,19 @@ Window {
}
function filterChoicesByText() {
function fill1(target, data) {
function fill1(targetIndex, data) {
if (!data) {
target.visible = false;
if (targetIndex < suggestions.count) {
suggestions.remove(targetIndex);
}
return;
}
console.log('suggestion:', JSON.stringify(data));
target.userStory = data;
target.image.source = data.lobby || target.defaultPicture;
target.placeText = data.name;
target.usersText = data.online_users + ((data.online_users === 1) ? ' user' : ' users');
target.visible = true;
if (suggestions.count <= targetIndex) {
suggestions.append(data);
} else {
suggestions.set(targetIndex, data);
}
}
var words = addressLine.text.toUpperCase().split(/\s+/).filter(identity);
var filtered = !words.length ? suggestionChoices : allDomains.filter(function (domain) {
@ -303,9 +301,9 @@ Window {
return text.indexOf(word) >= 0;
});
});
fill1(s0, filtered[0]);
fill1(s1, filtered[1]);
fill1(s2, filtered[2]);
fill1(0, filtered[0]);
fill1(1, filtered[1]);
fill1(2, filtered[2]);
}
function fillDestinations() {

11
interface/resources/qml/hifi/Card.qml
View file

@ -18,27 +18,28 @@ import "../styles-uit"
Rectangle {
property var goFunction: null;
property var userStory: null;
property alias image: lobby;
property alias placeText: place.text;
property alias usersText: users.text;
property int textPadding: 20;
property int textSize: 24;
property string defaultPicture: "../../images/default-domain.gif";
property string defaultThumbnail: Qt.resolvedUrl("../../images/default-domain.gif");
property string thumbnail: defaultThumbnail;
property string path: "";
HifiConstants { id: hifi }
Image {
id: lobby;
width: parent.width;
height: parent.height;
source: defaultPicture;
source: thumbnail || defaultThumbnail;
fillMode: Image.PreserveAspectCrop;
// source gets filled in later
anchors.verticalCenter: parent.verticalCenter;
anchors.left: parent.left;
onStatusChanged: {
if (status == Image.Error) {
console.log("source: " + source + ": failed to load " + JSON.stringify(userStory));
source = defaultPicture;
console.log("source: " + source + ": failed to load " + path);
source = defaultThumbnail;
}
}
}