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

announcment styling

Browse source
This commit is contained in:
howard-stearns 2017-05-01 15:35:17 -07:00
parent 9fab66b66a
commit 61b738e3cd
1 changed files with 49 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,7 +31,7 @@ Item {
property bool drillDownToPlace: false; property bool drillDownToPlace: false;
property bool showPlace: isConcurrency; property bool showPlace: isConcurrency;
property string messageColor: hifi.colors.blueAccent; property string messageColor: lozenge.visible ? "white" : hifi.colors.blueAccent;
property string timePhrase: pastTime(timestamp); property string timePhrase: pastTime(timestamp);
property int onlineUsers: 0; property int onlineUsers: 0;
property bool isConcurrency: action === 'concurrency'; property bool isConcurrency: action === 'concurrency';
@ -115,7 +115,7 @@ Item {
id: lobby; id: lobby;
visible: !hasGif || (animation.status !== Image.Ready); visible: !hasGif || (animation.status !== Image.Ready);
width: parent.width - (isConcurrency ? 0 : (2 * smallMargin)); width: parent.width - (isConcurrency ? 0 : (2 * smallMargin));
height: parent.height - messageHeight - (isConcurrency ? 0 : smallMargin); height: parent.height -(isAnnouncement ? smallMargin : messageHeight) - (isConcurrency ? 0 : smallMargin);
source: thumbnail || defaultThumbnail; source: thumbnail || defaultThumbnail;
fillMode: Image.PreserveAspectCrop; fillMode: Image.PreserveAspectCrop;
anchors { anchors {
@ -160,7 +160,24 @@ Item {
margins: textPadding; margins: textPadding;
} }
} }
Rectangle {
id: lozenge;
visible: isAnnouncement;
color: hifi.colors.redHighlight;
anchors.fill: infoRow;
radius: lozenge.height / 2.0;
border.width: lozengeHot.containsMouse ? 4 : 0;
border.color: "white";
}
Row { Row {
id: infoRow;
Image {
id: icon;
source: isAnnouncement ? "../../images/Announce-Blast.svg" : "../../images/snap-icon.svg";
width: 40;
height: 40;
visible: ((action === 'snapshot') || isAnnouncement) && (messageHeight >= 40);
}
FiraSansRegular { FiraSansRegular {
id: users; id: users;
visible: isConcurrency || isAnnouncement; visible: isConcurrency || isAnnouncement;
@ -169,34 +186,42 @@ Item {
color: messageColor; color: messageColor;
anchors.verticalCenter: message.verticalCenter; anchors.verticalCenter: message.verticalCenter;
} }
Image {
id: icon;
source: "../../images/snap-icon.svg"
width: 40;
height: 40;
visible: (action === 'snapshot') && (messageHeight >= 40);
}
RalewayRegular { RalewayRegular {
id: message; id: message;
visible: !isAnnouncement;
text: isConcurrency ? ((onlineUsers === 1) ? "person" : "people") : (isAnnouncement ? "connections" : (drillDownToPlace ? "snapshots" : ("by " + userName))); text: isConcurrency ? ((onlineUsers === 1) ? "person" : "people") : (isAnnouncement ? "connections" : (drillDownToPlace ? "snapshots" : ("by " + userName)));
size: textSizeSmall; size: textSizeSmall;
color: messageColor; color: messageColor;
elide: Text.ElideRight; // requires a width to be specified` elide: Text.ElideRight; // requires a width to be specified`
width: root.width - textPadding width: root.width - textPadding
- (users.visible ? users.width + parent.spacing : 0)
- (icon.visible ? icon.width + parent.spacing : 0) - (icon.visible ? icon.width + parent.spacing : 0)
- (users.visible ? users.width + parent.spacing : 0)
- (actionIcon.width + (2 * smallMargin)); - (actionIcon.width + (2 * smallMargin));
anchors { anchors {
bottom: parent.bottom; bottom: parent.bottom;
bottomMargin: parent.spacing; bottomMargin: parent.spacing;
} }
} }
Column {
visible: isAnnouncement;
RalewayRegular {
text: "connections" + " "; // fixme: pluralize
size: textSizeSmall;
color: "white"; // fixme not needed? get rid of complication in messageColor?
}
RalewayRegular {
text: "are here now"; // fixme pluralize
size: textSizeSmall * 0.7;
color: "white"; //' fixme not needed? get rid of complication in messageColor?
}
}
spacing: textPadding; spacing: textPadding;
height: messageHeight; height: messageHeight;
anchors { anchors {
bottom: parent.bottom; bottom: parent.bottom;
left: parent.left; left: parent.left;
leftMargin: textPadding; leftMargin: textPadding;
bottomMargin: isAnnouncement ? textPadding : 0;
} }
} }
// These two can be supplied to provide hover behavior. // These two can be supplied to provide hover behavior.
@ -214,6 +239,7 @@ Item {
} }
StateImage { StateImage {
id: actionIcon; id: actionIcon;
visible: !isAnnouncement;
imageURL: "../../images/info-icon-2-state.svg"; imageURL: "../../images/info-icon-2-state.svg";
size: 30; size: 30;
buttonState: messageArea.containsMouse ? 1 : 0; buttonState: messageArea.containsMouse ? 1 : 0;
@ -223,13 +249,25 @@ Item {
margins: smallMargin; margins: smallMargin;
} }
} }
function go() {
goFunction(drillDownToPlace ? ("/places/" + placeName) : ("/user_stories/" + storyId));
}
MouseArea { MouseArea {
id: messageArea; id: messageArea;
visible: !isAnnouncement;
width: parent.width; width: parent.width;
height: messageHeight; height: messageHeight;
anchors.top: lobby.bottom; anchors.top: lobby.bottom;
acceptedButtons: Qt.LeftButton; acceptedButtons: Qt.LeftButton;
onClicked: goFunction(drillDownToPlace ? ("/places/" + placeName) : ("/user_stories/" + storyId)); onClicked: go();
hoverEnabled: true;
}
MouseArea {
id: lozengeHot;
visible: lozenge.visible;
anchors.fill: lozenge;
acceptedButtons: Qt.LeftButton;
onClicked: go();
hoverEnabled: true; hoverEnabled: true;
} }
} }