Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 21:17:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

New PAL colors; slight layout changes

Browse source
This commit is contained in:
Zach Fox 2017-03-29 16:30:24 -07:00
parent a6ff3fcdb7
commit 4887081e2c
2 changed files with 20 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -150,7 +150,7 @@ Item {
FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; } FontLoader { id: firaSansSemiBold; source: "../../fonts/FiraSans-SemiBold.ttf"; }
font.family: firaSansSemiBold.name font.family: firaSansSemiBold.name
font.pixelSize: displayNameTextPixelSize font.pixelSize: displayNameTextPixelSize
selectionColor: hifi.colors.blueHighlight selectionColor: hifi.colors.blueAccent
selectedTextColor: "black" selectedTextColor: "black"
// Text Positioning // Text Positioning
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
@ -248,7 +248,7 @@ Item {
} }
onExited: { onExited: {
displayNameText.color = hifi.colors.darkGray displayNameText.color = hifi.colors.darkGray
userNameText.color = hifi.colors.greenShadow; userNameText.color = hifi.colors.blueAccent;
} }
} }
} }
@ -327,7 +327,7 @@ Item {
// Text Positioning // Text Positioning
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
// Style // Style
color: hifi.colors.greenShadow; color: hifi.colors.blueAccent;
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
enabled: selected && pal.activeTab == "nearbyTab" && thisNameCard.userName !== "" && isPresent; enabled: selected && pal.activeTab == "nearbyTab" && thisNameCard.userName !== "" && isPresent;
@ -342,7 +342,7 @@ Item {
} }
onExited: { onExited: {
displayNameText.color = hifi.colors.darkGray; displayNameText.color = hifi.colors.darkGray;
userNameText.color = hifi.colors.greenShadow; userNameText.color = hifi.colors.blueAccent;
} }
} }
} }

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

@ -107,7 +107,7 @@ Rectangle {
width: pal.width - 10; width: pal.width - 10;
height: pal.height - 10; height: pal.height - 10;
// Style // Style
color: pal.color; color: "white";
// Anchors // Anchors
anchors.centerIn: pal; anchors.centerIn: pal;
@ -209,11 +209,10 @@ Rectangle {
// Anchors // Anchors
anchors { anchors {
top: parent.top; top: parent.top;
topMargin: 2;
horizontalCenter: parent.horizontalCenter; horizontalCenter: parent.horizontalCenter;
} }
width: parent.width; width: parent.width;
height: 35 - anchors.topMargin; height: 50;
Rectangle { Rectangle {
id: nearbyTabSelector; id: nearbyTabSelector;
// Anchors // Anchors
@ -223,7 +222,7 @@ Rectangle {
} }
width: parent.width/2; width: parent.width/2;
height: parent.height; height: parent.height;
color: activeTab == "nearbyTab" ? pal.color : "#CCCCCC"; color: activeTab == "nearbyTab" ? palContainer.color : "#CCCCCC";
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
onClicked: { onClicked: {
@ -231,6 +230,7 @@ Rectangle {
refreshNearbyWithFilter(); refreshNearbyWithFilter();
} }
activeTab = "nearbyTab"; activeTab = "nearbyTab";
connectionsHelpText.color = hifi.colors.baseGray;
} }
} }
@ -249,7 +249,7 @@ Rectangle {
anchors.fill: parent; anchors.fill: parent;
// Style // Style
font.capitalization: Font.AllUppercase; font.capitalization: Font.AllUppercase;
color: hifi.colors.redHighlight; color: activeTab === "nearbyTab" ? hifi.colors.blueAccent : hifi.colors.baseGray;
// Alignment // Alignment
horizontalAlignment: Text.AlignHLeft; horizontalAlignment: Text.AlignHLeft;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
@ -295,7 +295,7 @@ Rectangle {
} }
width: parent.width/2; width: parent.width/2;
height: parent.height; height: parent.height;
color: activeTab == "connectionsTab" ? pal.color : "#CCCCCC"; color: activeTab == "connectionsTab" ? palContainer.color : "#CCCCCC";
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
onClicked: { onClicked: {
@ -305,6 +305,7 @@ Rectangle {
pal.sendToScript({method: 'refreshConnections'}); pal.sendToScript({method: 'refreshConnections'});
} }
activeTab = "connectionsTab"; activeTab = "connectionsTab";
connectionsHelpText.color = hifi.colors.blueAccent;
} }
} }
@ -342,7 +343,7 @@ Rectangle {
anchors.fill: parent; anchors.fill: parent;
// Style // Style
font.capitalization: Font.AllUppercase; font.capitalization: Font.AllUppercase;
color: hifi.colors.redHighlight; color: activeTab === "connectionsTab" ? hifi.colors.blueAccent : hifi.colors.baseGray;
// Alignment // Alignment
horizontalAlignment: Text.AlignHLeft; horizontalAlignment: Text.AlignHLeft;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
@ -366,7 +367,7 @@ Rectangle {
text: "[?]"; text: "[?]";
size: connectionsTabSelectorText.size + 6; size: connectionsTabSelectorText.size + 6;
font.capitalization: Font.AllUppercase; font.capitalization: Font.AllUppercase;
color: hifi.colors.redHighlight; color: connectionsTabSelectorText.color;
horizontalAlignment: Text.AlignHCenter; horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter; verticalAlignment: Text.AlignVCenter;
anchors.fill: parent; anchors.fill: parent;
@ -374,88 +375,20 @@ Rectangle {
MouseArea { MouseArea {
anchors.fill: parent; anchors.fill: parent;
hoverEnabled: true; hoverEnabled: true;
enabled: activeTab === "connectionsTab";
onClicked: letterbox(hifi.glyphs.question, onClicked: letterbox(hifi.glyphs.question,
"Connections and Friends", "Connections and Friends",
"<font color='purple'>Purple borders around profile pictures are <b>Connections</b>.</font><br>" + "<font color='purple'>Purple borders around profile pictures are <b>Connections</b>.</font><br>" +
"When your availability is set to Everyone, Connections can see your username and location.<br><br>" + "When your availability is set to Everyone, Connections can see your username and location.<br><br>" +
"<font color='green'>Green borders around profile pictures are <b>Friends</b>.</font><br>" + "<font color='green'>Green borders around profile pictures are <b>Friends</b>.</font><br>" +
"When your availability is set to Friends, only Friends can see your username and location."); "When your availability is set to Friends, only Friends can see your username and location.");
onEntered: connectionsHelpText.color = hifi.colors.redAccent; onEntered: connectionsHelpText.color = hifi.colors.blueHighlight;
onExited: connectionsHelpText.color = hifi.colors.redHighlight; onExited: connectionsHelpText.color = hifi.colors.blueAccent;
} }
} }
} }
} }
} }
Item {
id: tabBorders;
anchors.fill: parent;
property var color: hifi.colors.lightGray;
property int borderWeight: 3;
// Left border
Rectangle {
color: parent.color;
anchors {
left: parent.left;
bottom: parent.bottom;
}
width: parent.borderWeight;
height: parent.height - (activeTab == "nearbyTab" ? 0 : tabSelectorContainer.height);
}
// Right border
Rectangle {
color: parent.color;
anchors {
right: parent.right;
bottom: parent.bottom;
}
width: parent.borderWeight;
height: parent.height - (activeTab == "nearbyTab" ? tabSelectorContainer.height : 0);
}
// Bottom border
Rectangle {
color: parent.color;
anchors {
bottom: parent.bottom;
left: parent.left;
right: parent.right;
}
height: parent.borderWeight;
}
// Border between buttons
Rectangle {
color: parent.color;
anchors {
horizontalCenter: parent.horizontalCenter;
top: parent.top;
}
width: parent.borderWeight;
height: tabSelectorContainer.height + width;
}
// Border above selected tab
Rectangle {
color: parent.color;
anchors {
top: parent.top;
left: parent.left;
leftMargin: activeTab == "nearbyTab" ? 0 : parent.width/2;
}
width: parent.width/2;
height: parent.borderWeight;
}
// Border below unselected tab
Rectangle {
color: parent.color;
anchors {
top: parent.top;
topMargin: tabSelectorContainer.height;
left: parent.left;
leftMargin: activeTab == "nearbyTab" ? parent.width/2 : 0;
}
width: parent.width/2;
height: parent.borderWeight;
}
}
/***************************************** /*****************************************
NEARBY TAB NEARBY TAB
@ -798,7 +731,7 @@ Rectangle {
*****************************************/ *****************************************/
Rectangle { Rectangle {
id: connectionsTab; id: connectionsTab;
color: "#E3E3E3"; color: palContainer.color;
// Anchors // Anchors
anchors { anchors {
top: tabSelectorContainer.bottom; top: tabSelectorContainer.bottom;
@ -940,7 +873,8 @@ Rectangle {
// Text Positioning // Text Positioning
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
// Style // Style
color: hifi.colors.darkGray; color: hifi.colors.blueAccent;
font.underline: true;
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabled hoverEnabled: enabled
@ -950,7 +884,7 @@ Rectangle {
UserActivityLogger.palAction("go_to_user", model.userName); UserActivityLogger.palAction("go_to_user", model.userName);
} }
onEntered: connectionsLocationData.color = hifi.colors.blueHighlight; onEntered: connectionsLocationData.color = hifi.colors.blueHighlight;
onExited: connectionsLocationData.color = hifi.colors.darkGray; onExited: connectionsLocationData.color = hifi.colors.blueAccent;
} }
} }