Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-29 22:02:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Minor layout changes

Browse source
This commit is contained in:
Zach Fox 2017-03-30 14:08:03 -07:00
parent 0edbf1fbd9
commit c24b8b47a9
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -316,16 +316,16 @@ Item {
visible: thisNameCard.userName !== ""; visible: thisNameCard.userName !== "";
// Size // Size
width: parent.width width: parent.width
height: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize + 4 : displayNameTextPixelSize + 4 height: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize + 4 : parent.height;
// Anchors // Anchors
anchors.top: isMyCard ? myDisplayName.bottom : undefined; anchors.top: isMyCard ? myDisplayName.bottom : (pal.activeTab == "nearbyTab" ? displayNameContainer.bottom : parent.top);
anchors.bottom: !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;
// Text Size // Text Size
size: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize : displayNameTextPixelSize; size: pal.activeTab == "nearbyTab" || isMyCard ? usernameTextPixelSize : displayNameTextPixelSize;
// Text Positioning // Text Positioning
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignVCenter;
// Style // Style
color: hifi.colors.blueAccent; color: hifi.colors.blueAccent;
MouseArea { MouseArea {

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

@ -850,7 +850,7 @@ Rectangle {
} }
// LOCATION data // LOCATION data
FiraSansSemiBold { FiraSansRegular {
id: connectionsLocationData id: connectionsLocationData
// Properties // Properties
visible: styleData.role === "placeName"; visible: styleData.role === "placeName";
@ -883,7 +883,7 @@ Rectangle {
// "Friends" checkbox // "Friends" checkbox
HifiControlsUit.CheckBox { HifiControlsUit.CheckBox {
id: friendsCheckBox; id: friendsCheckBox;
visible: styleData.role === "friends"; visible: styleData.role === "friends" && model.userName !== myData.userName;
anchors.centerIn: parent; anchors.centerIn: parent;
checked: model ? (model["connection"] === "friend" ? true : false) : false; checked: model ? (model["connection"] === "friend" ? true : false) : false;
boxSize: 24; boxSize: 24;
@ -892,6 +892,7 @@ Rectangle {
connectionsUserModel.setProperty(model.userIndex, styleData.role, newValue); connectionsUserModel.setProperty(model.userIndex, styleData.role, newValue);
connectionsUserModelData[model.userIndex][styleData.role] = newValue; // Defensive programming connectionsUserModelData[model.userIndex][styleData.role] = newValue; // Defensive programming
// Insert line here about actually taking the friend/unfriend action // Insert line here about actually taking the friend/unfriend action
//pal.sendToScript({method: 'addFriend', params: model.userName});
// Also insert line here about logging the activity, similar to the commented line below // Also insert line here about logging the activity, similar to the commented line below
//UserActivityLogger["palAction"](newValue ? styleData.role : "un-" + styleData.role, model.sessionId); //UserActivityLogger["palAction"](newValue ? styleData.role : "un-" + styleData.role, model.sessionId);