Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 18:16:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixup keyboard shortcuts; Modify tooltips

Browse source
This commit is contained in:
Zach Fox 2019-08-19 14:19:25 -07:00
parent 14a04dfb1a
commit fd287654f4
2 changed files with 47 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
View file

@ -329,11 +329,13 @@ function onGeometryChanged(rect) {
} }
// These keys need to match what's in `SimplifiedEmoteIndicator.qml` in the `buttonsModel`
// for the tooltips to match the actual keys.
var POSITIVE_KEY = "z"; var POSITIVE_KEY = "z";
var NEGATIVE_KEY = "c"; var NEGATIVE_KEY = "x";
var RAISE_HAND_KEY = "v"; var RAISE_HAND_KEY = "c";
var APPLAUD_KEY = "b"; var APPLAUD_KEY = "v";
var POINT_KEY = "n"; var POINT_KEY = "b";
var EMOTE_WINDOW = "f"; var EMOTE_WINDOW = "f";
function keyPressHandler(event) { function keyPressHandler(event) {
if (!event.isAutoRepeat && ! event.isMeta && ! event.isControl && ! event.isAlt) { if (!event.isAutoRepeat && ! event.isMeta && ! event.isControl && ! event.isAlt) {

69
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -26,12 +26,12 @@ Rectangle {
// For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea` // For the below to work, the Repeater's Item's second child must be the individual button's `MouseArea`
property int requestedWidth: (drawerContainer.keepDrawerExpanded || property int requestedWidth: (drawerContainer.keepDrawerExpanded ||
emoteIndicatorMouseArea.containsMouse || emoteIndicatorMouseArea.containsMouse ||
emoteButtonsRepeater.itemAt(0).children[1].containsMouse || emoteButtonsRepeater.itemAt(0).hovered ||
emoteButtonsRepeater.itemAt(1).children[1].containsMouse || emoteButtonsRepeater.itemAt(1).hovered ||
emoteButtonsRepeater.itemAt(2).children[1].containsMouse || emoteButtonsRepeater.itemAt(2).hovered ||
emoteButtonsRepeater.itemAt(3).children[1].containsMouse || emoteButtonsRepeater.itemAt(3).hovered ||
emoteButtonsRepeater.itemAt(4).children[1].containsMouse || emoteButtonsRepeater.itemAt(4).hovered ||
emoteButtonsRepeater.itemAt(5).children[1].containsMouse) ? expandedWidth : originalWidth; emoteButtonsRepeater.itemAt(5).hovered) ? expandedWidth : originalWidth;
onRequestedWidthChanged: { onRequestedWidthChanged: {
root.requestNewWidth(root.requestedWidth); root.requestNewWidth(root.requestedWidth);
@ -107,14 +107,15 @@ Rectangle {
ListElement { imageURL: "images/raiseHand_Icon.svg"; hotkey: "C"; method: "raiseHand" } ListElement { imageURL: "images/raiseHand_Icon.svg"; hotkey: "C"; method: "raiseHand" }
ListElement { imageURL: "images/applaud_Icon.svg"; hotkey: "V"; method: "applaud" } ListElement { imageURL: "images/applaud_Icon.svg"; hotkey: "V"; method: "applaud" }
ListElement { imageURL: "images/point_Icon.svg"; hotkey: "B"; method: "point" } ListElement { imageURL: "images/point_Icon.svg"; hotkey: "B"; method: "point" }
ListElement { imageURL: "images/emote_Icon.svg"; hotkey: "N"; method: "toggleEmojiApp" } ListElement { imageURL: "images/emote_Icon.svg"; hotkey: "F"; method: "toggleEmojiApp" }
} }
Rectangle { Rectangle {
width: mainEmojiContainer.width width: mainEmojiContainer.width
height: drawerContainer.height height: drawerContainer.height
// For the below to work, the This Rectangle's second child must be the `MouseArea` // For the below to work, the This Rectangle's second child must be the `MouseArea`
color: children[1].containsMouse ? "#000000" : simplifiedUI.colors.white color: hovered ? "#000000" : simplifiedUI.colors.white
property alias hovered: emoteTrayMouseArea.containsMouse
Image { Image {
id: emoteTrayButtonImage id: emoteTrayButtonImage
@ -124,6 +125,38 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
source: model.imageURL source: model.imageURL
mipmap: true mipmap: true
visible: false
}
ColorOverlay {
anchors.fill: emoteTrayButtonImage
source: emoteTrayButtonImage
color: parent.hovered ? "#ffffff" : "#000000"
}
Rectangle {
visible: parent.hovered
anchors.left: parent.left
anchors.bottom: parent.bottom
width: toolTipText.width + 4
height: toolTipText.height - 3
color: "#000000"
opacity: 0.8
radius: 4
HifiStylesUit.GraphikRegular {
id: toolTipText
anchors.left: parent.left
anchors.leftMargin: 2
anchors.bottom: parent.bottom
width: paintedWidth
height: paintedHeight
text: model.hotkey
verticalAlignment: TextInput.AlignBottom
horizontalAlignment: TextInput.AlignLeft
color: simplifiedUI.colors.text.white
size: 22
}
} }
MouseArea { MouseArea {
@ -141,26 +174,6 @@ Rectangle {
onEntered: { onEntered: {
Tablet.playSound(TabletEnums.ButtonHover); Tablet.playSound(TabletEnums.ButtonHover);
} }
Rectangle {
anchors.bottom: parent.bottom
anchors.right: parent.right
height: 1
width: 20
color: "transparent"
ToolTip {
text: model.hotkey
visible: emoteTrayMouseArea.containsMouse
}
}
}
ColorOverlay {
anchors.fill: emoteTrayButtonImage
opacity: emoteTrayMouseArea.containsMouse ? 1.0 : 0
source: emoteTrayButtonImage
color: "#ffffff"
} }
} }
} }