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

Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll

Browse source
This commit is contained in:
howard-stearns 2018-06-05 15:30:04 -07:00
commit ce41b83bad
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -319,10 +319,10 @@ Item {
visible: thisNameCard.userName !== ""; visible: thisNameCard.userName !== "";
// Size // Size
width: parent.width width: parent.width
height: usernameTextPixelSize + 4 height: paintedHeight
// Anchors // Anchors
anchors.top: isMyCard ? myDisplayName.bottom : pal.activeTab == "nearbyTab" ? displayNameContainer.bottom : undefined //(parent.height - displayNameTextPixelSize/2)); anchors.top: isMyCard ? myDisplayName.bottom : pal.activeTab == "nearbyTab" ? displayNameContainer.bottom : avatarImage.top //(parent.height - displayNameTextPixelSize/2));
anchors.verticalCenter: pal.activeTab == "connectionsTab" && !isMyCard ? avatarImage.verticalCenter : undefined anchors.bottom: pal.activeTab === "connectionsTab" && !isMyCard ? avatarImage.bottom : undefined
anchors.left: avatarImage.right; anchors.left: avatarImage.right;
anchors.leftMargin: avatarImage.visible ? 5 : 0; anchors.leftMargin: avatarImage.visible ? 5 : 0;
anchors.rightMargin: 5; anchors.rightMargin: 5;