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

Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into dk/newMessageStuff

Browse source
This commit is contained in:
David Kelly 2017-03-14 08:55:02 -07:00
commit 9daa94ce73
2 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
interface/resources/qml/hifi/NameCard.qml
View file

@ -91,7 +91,7 @@ Item {
enabled: selected || isMyCard;
hoverEnabled: enabled
onClicked: {
userInfoViewer.url = "http://highfidelity.com/users/" + (pal.activeTab == "nearbyTab" ? userName : displayName); // Connections tab puts username in "displayname" field
userInfoViewer.url = "http://highfidelity.com/users/" + userName;
userInfoViewer.visible = true;
}
}
@ -202,13 +202,12 @@ Item {
// DisplayName container for others' cards
Item {
id: displayNameContainer
visible: !isMyCard
visible: !isMyCard && pal.activeTab !== "connectionsTab"
// Size
width: parent.width - anchors.leftMargin - avatarImage.width - anchors.leftMargin;
height: displayNameTextPixelSize + 4
// Anchors
anchors.top: pal.activeTab == "connectionsTab" ? undefined : avatarImage.top;
anchors.bottom: pal.activeTab == "connectionsTab" ? avatarImage.bottom : undefined;
anchors.top: avatarImage.top;
anchors.left: avatarImage.right
anchors.leftMargin: avatarImage.visible ? 5 : 0;
// DisplayName Text for others' cards
@ -227,8 +226,7 @@ Item {
// Text Positioning
verticalAlignment: Text.AlignTop
// Style
color: (pal.activeTab == "nearbyTab" && (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse))
? hifi.colors.blueHighlight : (pal.activeTab == "nearbyTab" ? hifi.colors.darkGray : hifi.colors.greenShadow);
color: (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse) ? hifi.colors.blueHighlight : hifi.colors.darkGray;
MouseArea {
id: displayNameTextMouseArea;
anchors.fill: parent
@ -297,21 +295,22 @@ Item {
// Properties
text: thisNameCard.userName
elide: Text.ElideRight
visible: thisNameCard.displayName
visible: thisNameCard.userName !== "";
// Size
width: parent.width
height: usernameTextPixelSize + 4
height: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize + 4 : displayNameTextPixelSize + 4
// Anchors
anchors.top: isMyCard ? myDisplayName.bottom : undefined;
anchors.bottom: isMyCard ? undefined : avatarImage.bottom
anchors.bottom: !isMyCard ? avatarImage.bottom : undefined;
anchors.left: avatarImage.right;
anchors.leftMargin: avatarImage.visible ? 5 : 0;
// Text Size
size: usernameTextPixelSize;
size: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize : displayNameTextPixelSize;
// Text Positioning
verticalAlignment: Text.AlignBottom
// Style
color: (pal.activeTab == "nearbyTab" && (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse)) ? hifi.colors.blueHighlight : hifi.colors.greenShadow;
color: (pal.activeTab == "nearbyTab" && (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse))
? hifi.colors.blueHighlight : hifi.colors.greenShadow;
MouseArea {
id: userNameTextMouseArea;
anchors.fill: parent

6
interface/resources/qml/hifi/Pal.qml
View file

@ -860,8 +860,8 @@ Rectangle {
visible: styleData.role === "userName";
profileUrl: (model && model.profileUrl) || "";
imageMaskColor: rowColor(styleData.selected, styleData.row % 2);
displayName: model ? model.userName : "";
userName: "";
displayName: "";
userName: model ? model.userName : "";
connectionStatus : model ? model.connection : "";
selected: styleData.selected;
// Size
@ -1001,7 +1001,7 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter;
// Style
color: closeButtonMouseArea.containsMouse ? hifi.colors.lightGray : hifi.colors.darkGray;
color: closeButtonMouseArea.containsMouse ? hifi.colors.redAccent : hifi.colors.redHighlight;
MouseArea {
id: closeButtonMouseArea;
anchors.fill: parent