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

scroll, margins

Browse source
This commit is contained in:
howard-stearns 2017-04-20 13:43:55 -07:00
parent b8e9fb67b8
commit bc77eeeabd
2 changed files with 55 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,7 +144,7 @@ Column {
RalewayLight { RalewayLight {
id: label; id: label;
text: labelText; text: labelText;
color: hifi.colors.blueHighlight; color: hifi.colors.white;
size: 28; size: 28;
} }
ListView { ListView {
@ -152,6 +152,9 @@ Column {
clip: true; clip: true;
model: suggestions; model: suggestions;
orientation: ListView.Horizontal; orientation: ListView.Horizontal;
highlightMoveDuration: -1;
highlightMoveVelocity: -1;
highlight: Rectangle { color: "transparent"; border.width: 4; border.color: hifiStyleConstants.colors.blueHighlight; z: 1; }
spacing: 14; spacing: 14;
width: parent.width; width: parent.width;

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

@ -221,91 +221,64 @@ StackView {
} }
} }
} }
Rectangle {
id: topBar
height: 37
color: hifiStyleConstants.colors.white
anchors.right: parent.right
anchors.rightMargin: 0
anchors.left: parent.left
anchors.leftMargin: 0
anchors.topMargin: 0
anchors.top: addressBar.bottom
Row {
id: thing
spacing: 5 * hifi.layout.spacing
anchors {
top: parent.top;
left: parent.left
leftMargin: 25
}
TabletTextButton {
id: allTab;
text: "ALL";
property string includeActions: 'snapshot,concurrency';
selected: allTab === selectedTab;
action: tabSelect;
}
TabletTextButton {
id: placeTab;
text: "PLACES";
property string includeActions: 'concurrency';
selected: placeTab === selectedTab;
action: tabSelect;
}
TabletTextButton {
id: snapTab;
text: "SNAP";
property string includeActions: 'snapshot';
selected: snapTab === selectedTab;
action: tabSelect;
}
}
}
Rectangle { Rectangle {
id: bgMain; id: bgMain;
color: hifiStyleConstants.colors.white; color: hifiStyleConstants.colors.faintGray50;
anchors { anchors {
top: addressBar.bottom;
bottom: parent.keyboardEnabled ? keyboard.top : parent.bottom; bottom: parent.keyboardEnabled ? keyboard.top : parent.bottom;
bottomMargin: 0;
right: parent.right;
rightMargin: 0;
left: parent.left; left: parent.left;
leftMargin: 0; right: parent.right;
top: topBar.bottom;
topMargin: 0;
} }
Feed { ScrollView {
id: happeningNow; anchors.fill: bgMain;
width: bgMain.width; horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff;
metaverseServerUrl: addressBarDialog.metaverseServerUrl; verticalScrollBarPolicy: Qt.ScrollBarAlwaysOn; //Qt.ScrollBarAsNeeded;
actions: selectedTab.includeActions; Rectangle { // Column margins require QtQuick 2.7, which we don't use yet.
filter: addressLine.text; id: column;
} property real pad: 10;
Feed { width: bgMain.width - column.pad;
id: places; height: stack.height;
width: bgMain.width; color: "transparent";
metaverseServerUrl: addressBarDialog.metaverseServerUrl; anchors {
actions: 'concurrency'; left: bgMain.left;
filter: addressLine.text; leftMargin: column.pad;
anchors.top: happeningNow.bottom; topMargin: column.pad;
} }
Feed { Column {
id: snapshots; id: stack;
width: bgMain.width; width: column.width;
metaverseServerUrl: addressBarDialog.metaverseServerUrl; spacing: column.pad;
actions: 'snapshot'; Feed {
filter: addressLine.text; id: happeningNow;
anchors.top: places.bottom; width: parent.width;
property real cardScale: 1.5;
cardWidth: places.cardWidth * happeningNow.cardScale;
cardHeight: places.cardHeight * happeningNow.cardScale;
metaverseServerUrl: addressBarDialog.metaverseServerUrl;
labelText: 'Happening Now';
actions: 'concurrency,snapshot'; //selectedTab.includeActions;
filter: addressLine.text;
}
Feed {
id: places;
width: parent.width;
metaverseServerUrl: addressBarDialog.metaverseServerUrl;
labelText: 'Places';
actions: 'concurrency';
filter: addressLine.text;
}
Feed {
id: snapshots;
width: parent.width;
metaverseServerUrl: addressBarDialog.metaverseServerUrl;
labelText: 'Recent Activity';
actions: 'snapshot';
filter: addressLine.text;
}
}
}
} }
} }
@ -387,11 +360,6 @@ StackView {
return true; return true;
} }
property var selectedTab: allTab;
function tabSelect(textButton) {
selectedTab = textButton;
}
function updateLocationText(enteringAddress) { function updateLocationText(enteringAddress) {
if (enteringAddress) { if (enteringAddress) {
notice.text = "Go To a place, @user, path, or network address:"; notice.text = "Go To a place, @user, path, or network address:";