diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index f547975533..2b44a72fe3 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -79,14 +79,13 @@ Item {
}
StateImage {
id: infoHoverImage;
- visible: avatarImageMouseArea.containsMouse ? true : false;
+ visible: false;
imageURL: "../../images/info-icon-2-state.svg";
size: 32;
buttonState: 1;
anchors.centerIn: parent;
}
MouseArea {
- id: avatarImageMouseArea;
anchors.fill: parent
enabled: selected || isMyCard;
hoverEnabled: enabled
@@ -94,6 +93,8 @@ Item {
userInfoViewer.url = defaultBaseUrl + "/users/" + userName;
userInfoViewer.visible = true;
}
+ onEntered: infoHoverImage.visible = true;
+ onExited: infoHoverImage.visible = false;
}
}
@@ -124,7 +125,7 @@ Item {
anchors.leftMargin: avatarImage.visible ? 5 : 0;
anchors.rightMargin: 5;
// Style
- color: myDisplayNameMouseArea.containsMouse ? hifi.colors.lightGrayText : hifi.colors.textFieldLightBackground
+ color: hifi.colors.textFieldLightBackground
border.color: hifi.colors.blueHighlight
border.width: 0
TextInput {
@@ -165,7 +166,6 @@ Item {
}
}
MouseArea {
- id: myDisplayNameMouseArea;
anchors.fill: parent
hoverEnabled: true
onClicked: {
@@ -182,6 +182,8 @@ Item {
pal.currentlyEditingDisplayName = true
myDisplayNameText.autoScroll = true;
}
+ onEntered: myDisplayName.color = hifi.colors.lightGrayText;
+ onExited: myDisplayName.color = hifi.colors.textFieldLightBackground;
}
// Edit pencil glyph
HiFiGlyphs {
@@ -226,13 +228,20 @@ Item {
// Text Positioning
verticalAlignment: Text.AlignTop
// Style
- color: (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse) ? hifi.colors.blueHighlight : hifi.colors.darkGray;
+ color: hifi.colors.darkGray;
MouseArea {
- id: displayNameTextMouseArea;
anchors.fill: parent
enabled: selected && pal.activeTab == "nearbyTab" && thisNameCard.userName !== "";
hoverEnabled: enabled
onClicked: pal.sendToScript({method: 'goToUser', params: thisNameCard.userName});
+ onEntered: {
+ displayNameText.color = hifi.colors.blueHighlight;
+ userNameText.color = hifi.colors.blueHighlight;
+ }
+ onExited: {
+ displayNameText.color = hifi.colors.darkGray
+ userNameText.color = hifi.colors.greenShadow;
+ }
}
}
TextMetrics {
@@ -309,14 +318,20 @@ Item {
// Text Positioning
verticalAlignment: Text.AlignBottom
// Style
- color: (pal.activeTab == "nearbyTab" && (displayNameTextMouseArea.containsMouse || userNameTextMouseArea.containsMouse))
- ? hifi.colors.blueHighlight : hifi.colors.greenShadow;
+ color: hifi.colors.greenShadow;
MouseArea {
- id: userNameTextMouseArea;
anchors.fill: parent
enabled: selected && pal.activeTab == "nearbyTab" && thisNameCard.userName !== "";
hoverEnabled: enabled
onClicked: pal.sendToScript({method: 'goToUser', params: thisNameCard.userName});
+ onEntered: {
+ displayNameText.color = hifi.colors.blueHighlight;
+ userNameText.color = hifi.colors.blueHighlight;
+ }
+ onExited: {
+ displayNameText.color = hifi.colors.darkGray;
+ userNameText.color = hifi.colors.greenShadow;
+ }
}
}
// VU Meter
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index 762a0a14c7..3099087bd4 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -346,13 +346,12 @@ Rectangle {
text: "[?]";
size: connectionsTabSelectorText.size + 6;
font.capitalization: Font.AllUppercase;
- color: connectionsTabSelectorMouseArea.containsMouse ? hifi.colors.redAccent : hifi.colors.redHighlight;
+ color: hifi.colors.redHighlight;
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
anchors.fill: parent;
}
MouseArea {
- id: connectionsTabSelectorMouseArea;
anchors.fill: parent;
hoverEnabled: true;
onClicked: letterbox(hifi.glyphs.question,
@@ -361,6 +360,8 @@ Rectangle {
"When your availability is set to Everyone, Connections can see your username and location.
" +
"Green borders around profile pictures are Friends.
" +
"When your availability is set to Friends, only Friends can see your username and location.");
+ onEntered: connectionsHelpText.color = hifi.colors.redAccent;
+ onExited: connectionsHelpText.color = hifi.colors.redHighlight;
}
}
}
@@ -703,7 +704,6 @@ Rectangle {
}
// This Rectangle refers to the [?] popup button next to "NAMES"
Rectangle {
- id: helpText;
color: hifi.colors.tableBackgroundLight;
width: 20;
height: hifi.dimensions.tableHeaderHeight - 2;
@@ -712,16 +712,16 @@ Rectangle {
anchors.topMargin: 1;
anchors.leftMargin: actionButtonWidth + nearbyNameCardWidth/2 + displayNameHeaderMetrics.width/2 + 6;
RalewayRegular {
+ id: helpText;
text: "[?]";
size: hifi.fontSizes.tableHeading + 2;
font.capitalization: Font.AllUppercase;
- color: helpTextMouseArea.containsMouse ? hifi.colors.baseGrayHighlight : hifi.colors.darkGray;
+ color: hifi.colors.darkGray;
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
anchors.fill: parent;
}
MouseArea {
- id: helpTextMouseArea;
anchors.fill: parent;
hoverEnabled: true;
onClicked: letterbox(hifi.glyphs.question,
@@ -733,6 +733,8 @@ Rectangle {
"If you can see someone's username, you can GoTo them by selecting them in the PAL, then clicking their name.
" +
"
If someone's display name isn't set, a unique session display name is assigned to them.
" +
"
Administrators of this domain can also see the username or machine ID associated with each avatar present.");
+ onEntered: helpText.color = hifi.colors.baseGrayHighlight;
+ onExited: helpText.color = hifi.colors.darkGray;
}
}
// This Rectangle refers to the [?] popup button next to "ADMIN"
@@ -750,19 +752,20 @@ Rectangle {
text: "[?]";
size: hifi.fontSizes.tableHeading + 2;
font.capitalization: Font.AllUppercase;
- color: adminHelpTextMouseArea.containsMouse ? "#94132e" : hifi.colors.redHighlight;
+ color: hifi.colors.redHighlight;
horizontalAlignment: Text.AlignHCenter;
verticalAlignment: Text.AlignVCenter;
anchors.fill: parent;
}
MouseArea {
- id: adminHelpTextMouseArea;
anchors.fill: parent;
hoverEnabled: true;
onClicked: letterbox(hifi.glyphs.question,
"Admin Actions",
"Silence mutes a user's microphone. Silenced users can unmute themselves by clicking "UNMUTE" on their toolbar.
" +
"Ban removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.");
+ onEntered: adminHelpText.color = "#94132e";
+ onExited: adminHelpText.color = hifi.colors.redHighlight;
}
}
} // "Nearby" Tab
@@ -887,13 +890,14 @@ Rectangle {
// Text Positioning
verticalAlignment: Text.AlignVCenter
// Style
- color: connectionsLocationDataMouseArea.containsMouse ? hifi.colors.blueHighlight : hifi.colors.darkGray;
+ color: hifi.colors.darkGray;
MouseArea {
- id: connectionsLocationDataMouseArea;
anchors.fill: parent
hoverEnabled: enabled
enabled: connectionsNameCard.selected && pal.activeTab == "connectionsTab"
onClicked: pal.sendToScript({method: 'goToUser', params: model.userName});
+ onEntered: connectionsLocationData.color = hifi.colors.blueHighlight;
+ onExited: connectionsLocationData.color = hifi.colors.darkGray;
}
}
@@ -981,7 +985,7 @@ Rectangle {
}
Item {
- id: closeButton
+ id: closeButtonContainer
anchors {
top: parent.top;
right: parent.right;
@@ -990,6 +994,7 @@ Rectangle {
width: parent.width/2;
FiraSansSemiBold {
+ id: closeButton;
// Properties
text: "CLOSE";
elide: Text.ElideRight;
@@ -1001,12 +1006,13 @@ Rectangle {
verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter;
// Style
- color: closeButtonMouseArea.containsMouse ? hifi.colors.redAccent : hifi.colors.redHighlight;
+ color: hifi.colors.redHighlight;
MouseArea {
- id: closeButtonMouseArea;
anchors.fill: parent
hoverEnabled: enabled
onClicked: userInfoViewer.visible = false;
+ onEntered: closeButton.color = hifi.colors.redAccent;
+ onExited: closeButton.color = hifi.colors.redHighlight;
}
}
}
@@ -1014,7 +1020,7 @@ Rectangle {
Item {
id: urlBar
anchors {
- top: closeButton.bottom;
+ top: closeButtonContainer.bottom;
left: parent.left;
right: parent.right;
}