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

Fixup emote indicator

Browse source
This commit is contained in:
Zach Fox 2019-08-15 09:21:42 -07:00
parent 46a8e804b3
commit bfb4c0c49a
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -21,7 +21,7 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
property int originalWidth: 48 property int originalWidth: 48
property int expandedWidth: 336 property int expandedWidth: mainEmojiContainer.width + drawerContainer.width
property int requestedWidth: (drawerContainer.keepDrawerExpanded || property int requestedWidth: (drawerContainer.keepDrawerExpanded ||
emoteIndicatorMouseArea.containsMouse || emoteIndicatorMouseArea.containsMouse ||
happyButtonMouseArea.containsMouse || happyButtonMouseArea.containsMouse ||
@ -68,7 +68,6 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabled hoverEnabled: enabled
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
drawerContainer.keepDrawerExpanded = !drawerContainer.keepDrawerExpanded; drawerContainer.keepDrawerExpanded = !drawerContainer.keepDrawerExpanded;
@ -86,7 +85,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
leftPadding: root.originalWidth leftPadding: root.originalWidth
height: parent.height height: parent.height
width: root.expandedWidth width: childrenRect.width
Rectangle { Rectangle {
id: happyButtonContainer id: happyButtonContainer
@ -106,8 +105,7 @@ Rectangle {
MouseArea { MouseArea {
id: happyButtonMouseArea id: happyButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabled
onClicked: { hoverEnabled: enabled
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
@ -148,8 +146,7 @@ Rectangle {
MouseArea { MouseArea {
id: sadButtonMouseArea id: sadButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled hoverEnabled: enabled
Tablet.playSound(TabletEnu: enabled
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
@ -190,8 +187,7 @@ Rectangle {
MouseArea { MouseArea {
id: raiseHandButtonMouseArea id: raiseHandButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabledTabletEnums.ButtonClick); hoverEnabled: enabled
sendToScript({
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
@ -232,8 +228,7 @@ Rectangle {
MouseArea { MouseArea {
id: applaudButtonMouseArea id: applaudButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: enab hoverEnabled: enabled
"source": "EmoteAppBarled
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
@ -274,8 +269,7 @@ Rectangle {
MouseArea { MouseArea {
id: pointButtonMouseArea id: pointButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabledoteAppBar.qml", hoverEnabled: enabled
"method": "pointPresse
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);
@ -306,8 +300,10 @@ Rectangle {
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "😊" text: "😊"
anchors.fill: parent anchors.horizontalCenter: parent.horizontalCenter
anchors.rightMargin: 1 anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: -2
anchors.verticalCenterOffset: -2
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
size: 26 size: 26
color: simplifiedUI.colors.text.black color: simplifiedUI.colors.text.black
@ -316,8 +312,7 @@ Rectangle {
MouseArea { MouseArea {
id: emojiButtonMouseArea id: emojiButtonMouseArea
anchors.fill: parent anchors.fill: parent
hoverEnabled: enabledggleEmojiApp" hoverEnabled: enabled
});
onClicked: { onClicked: {
Tablet.playSound(TabletEnums.ButtonClick); Tablet.playSound(TabletEnums.ButtonClick);