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

pr review

Browse source
This commit is contained in:
howard-stearns 2017-04-27 12:56:32 -07:00
parent 97777a416d
commit 56196c03a3
3 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -130,7 +130,7 @@ Rectangle {
property int dropSamples: 9; property int dropSamples: 9;
property int dropSpread: 0; property int dropSpread: 0;
DropShadow { DropShadow {
visible: showPlace && desktop.gradientsSupported; visible: showPlace; // Do we have to check for whatever the modern equivalent is for desktop.gradientsSupported?
source: place; source: place;
anchors.fill: place; anchors.fill: place;
horizontalOffset: dropHorizontalOffset; horizontalOffset: dropHorizontalOffset;

5
interface/resources/qml/hifi/Feed.qml
View file

@ -31,6 +31,7 @@ Column {
property string labelText: actions; property string labelText: actions;
property string filter: ''; property string filter: '';
onFilterChanged: filterChoicesByText(); onFilterChanged: filterChoicesByText();
property var goFunction: null;
HifiConstants { id: hifi } HifiConstants { id: hifi }
ListModel { id: suggestions; } ListModel { id: suggestions; }
@ -57,7 +58,7 @@ Column {
created_at: data.created_at || "", created_at: data.created_at || "",
action: data.action || "", action: data.action || "",
thumbnail_url: resolveUrl(thumbnail_url), thumbnail_url: resolveUrl(thumbnail_url),
image_url: resolveUrl(data.details.image_url), image_url: resolveUrl(data.details && data.details.image_url),
metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity. metaverseId: (data.id || "").toString(), // Some are strings from server while others are numbers. Model objects require uniformity.
@ -181,7 +182,7 @@ Column {
delegate: Card { delegate: Card {
width: cardWidth; width: cardWidth;
height: cardHeight; height: cardHeight;
goFunction: goCard; // fixme global goFunction: root.goFunction;
userName: model.username; userName: model.username;
placeName: model.place_name; placeName: model.place_name;
hifiUrl: model.place_name + model.path; hifiUrl: model.place_name + model.path;

9
interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
View file

@ -242,7 +242,7 @@ StackView {
height: stack.height; height: stack.height;
color: "transparent"; color: "transparent";
anchors { anchors {
left: bgMain.left; left: parent.left;
leftMargin: column.pad; leftMargin: column.pad;
topMargin: column.pad; topMargin: column.pad;
} }
@ -258,9 +258,10 @@ StackView {
cardHeight: places.cardHeight * happeningNow.cardScale; cardHeight: places.cardHeight * happeningNow.cardScale;
metaverseServerUrl: addressBarDialog.metaverseServerUrl; metaverseServerUrl: addressBarDialog.metaverseServerUrl;
labelText: 'Happening Now'; labelText: 'Happening Now';
//actions: 'concurrency,snapshot'; // uncomment this line instead of next to produce fake announcement data for testing. actions: 'concurrency,snapshot'; // uncomment this line instead of next to produce fake announcement data for testing.
actions: 'announcement'; //actions: 'announcement';
filter: addressLine.text; filter: addressLine.text;
goFunction: goCard;
} }
Feed { Feed {
id: places; id: places;
@ -269,6 +270,7 @@ StackView {
labelText: 'Places'; labelText: 'Places';
actions: 'concurrency'; actions: 'concurrency';
filter: addressLine.text; filter: addressLine.text;
goFunction: goCard;
} }
Feed { Feed {
id: snapshots; id: snapshots;
@ -277,6 +279,7 @@ StackView {
labelText: 'Recent Activity'; labelText: 'Recent Activity';
actions: 'snapshot'; actions: 'snapshot';
filter: addressLine.text; filter: addressLine.text;
goFunction: goCard;
} }
} }
} }