mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 09:48:44 +02:00
Working on tray functionality
This commit is contained in:
parent
bc67241100
commit
46a8e804b3
3 changed files with 268 additions and 83 deletions
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
"baseImagesURL": "./resources/images/emojis/png1024/",
|
|
||||||
"baseImagesURL": "https://hifi-content.s3.amazonaws.com/milad/ROLC/mnt/d/ROLC_High-Fidelity/02_Organize/O_Projects/Repos/hifi-content/Prototyping/emojis/"
|
|
||||||
}
|
|
|
@ -222,8 +222,6 @@ Rectangle {
|
||||||
root.isSelected = true;
|
root.isSelected = true;
|
||||||
root.currentCode = mainModel.get(index).code.utf;
|
root.currentCode = mainModel.get(index).code.utf;
|
||||||
}
|
}
|
||||||
onExited: {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,8 +21,15 @@ Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
property int originalWidth: 48
|
property int originalWidth: 48
|
||||||
property int hoveredWidth: 357
|
property int expandedWidth: 336
|
||||||
property int requestedWidth
|
property int requestedWidth: (drawerContainer.keepDrawerExpanded ||
|
||||||
|
emoteIndicatorMouseArea.containsMouse ||
|
||||||
|
happyButtonMouseArea.containsMouse ||
|
||||||
|
sadButtonMouseArea.containsMouse ||
|
||||||
|
raiseHandButtonMouseArea.containsMouse ||
|
||||||
|
applaudButtonMouseArea.containsMouse ||
|
||||||
|
pointButtonMouseArea.containsMouse ||
|
||||||
|
emojiButtonMouseArea.containsMouse) ? expandedWidth : originalWidth;
|
||||||
|
|
||||||
onRequestedWidthChanged: {
|
onRequestedWidthChanged: {
|
||||||
root.requestNewWidth(root.requestedWidth);
|
root.requestNewWidth(root.requestedWidth);
|
||||||
|
@ -37,32 +44,8 @@ Rectangle {
|
||||||
id: simplifiedUI
|
id: simplifiedUI
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
MILAD NOTE:
|
|
||||||
Right now there are some strange issues around overlapping
|
|
||||||
onEnters with mouse areas. I was having a hard time getting an individual
|
|
||||||
hover happening. Not sure if there is just one mouse menu that gives
|
|
||||||
info about what is underneath to be able to be toggle an individual icon on and off.
|
|
||||||
*/
|
|
||||||
MouseArea {
|
|
||||||
id: emoteMouseArea
|
|
||||||
anchors.fill: parent
|
|
||||||
hoverEnabled: enabled
|
|
||||||
propagateComposedEvents: true;
|
|
||||||
onEntered: {
|
|
||||||
Tablet.playSound(TabletEnums.ButtonHover);
|
|
||||||
root.requestedWidth = root.hoveredWidth;
|
|
||||||
}
|
|
||||||
onExited: {
|
|
||||||
Tablet.playSound(TabletEnums.ButtonClick);
|
|
||||||
root.requestedWidth = root.originalWidth;
|
|
||||||
}
|
|
||||||
z: 2
|
|
||||||
}
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: mainEmojiContainer
|
id: mainEmojiContainer
|
||||||
z: 2
|
|
||||||
color: simplifiedUI.colors.darkBackground
|
color: simplifiedUI.colors.darkBackground
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.left: parent.left
|
anchors.left: parent.left
|
||||||
|
@ -80,50 +63,39 @@ Rectangle {
|
||||||
color: simplifiedUI.colors.white
|
color: simplifiedUI.colors.white
|
||||||
}
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: emoteIndicatorMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: enabled
|
||||||
|
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
drawerContainer.keepDrawerExpanded = !drawerContainer.keepDrawerExpanded;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
onEntered: {
|
||||||
MILAD NOTE:
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
The main container of the actual buttons
|
}
|
||||||
*/
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Row {
|
Row {
|
||||||
id: drawerContainer
|
id: drawerContainer
|
||||||
z: 1
|
property bool keepDrawerExpanded: false
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
leftPadding: root.originalWidth
|
leftPadding: root.originalWidth
|
||||||
height: parent.height
|
height: parent.height
|
||||||
width: root.hoveredWidth
|
width: root.expandedWidth
|
||||||
|
|
||||||
/*
|
|
||||||
MILAD NOTE:
|
|
||||||
Below is one button. They are just text representations now, but
|
|
||||||
they probably be switched with Image {} to be supplied by Joshua.
|
|
||||||
*/
|
|
||||||
|
|
||||||
ListModel {
|
|
||||||
id: buttonsModel
|
|
||||||
ListElement { text: "Z"; method: "happyPressed" }
|
|
||||||
ListElement { text: "C"; method: "sadPressed" }
|
|
||||||
ListElement { text: "V"; method: "raiseHandPressed" }
|
|
||||||
ListElement { text: "B"; method: "applaudPressed" }
|
|
||||||
ListElement { text: "N"; method: "pointPressed" }
|
|
||||||
ListElement { text: "😊"; method: "toggleEmojiApp" }
|
|
||||||
}
|
|
||||||
|
|
||||||
Repeater {
|
|
||||||
id: emoteButtonsRepeater
|
|
||||||
model: buttonsModel
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
z: 3
|
id: happyButtonContainer
|
||||||
width: root.originalWidth
|
width: root.originalWidth
|
||||||
height: drawerContainer.height
|
height: drawerContainer.height
|
||||||
color: simplifiedUI.colors.white
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
HifiStylesUit.GraphikRegular {
|
HifiStylesUit.GraphikRegular {
|
||||||
text: model.text
|
text: "Z"
|
||||||
z: 3
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
anchors.rightMargin: 1
|
anchors.rightMargin: 1
|
||||||
horizontalAlignment: Text.AlignHCenter
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
@ -132,19 +104,238 @@ Rectangle {
|
||||||
}
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: buttonMouseArea
|
id: happyButtonMouseArea
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
hoverEnabled: false
|
|
||||||
propagateComposedEvents: true;
|
onClicked: { hoverEnabled: enabled
|
||||||
z: 4
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
sendToScript({
|
sendToScript({
|
||||||
"source": "EmoteAppBar.qml",
|
"source": "EmoteAppBar.qml",
|
||||||
"method": model.method
|
"method": "happyPressed"
|
||||||
});
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
}
|
}
|
||||||
|
|
||||||
onEntered: {
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
}
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: sadButtonContainer
|
||||||
|
width: root.originalWidth
|
||||||
|
height: drawerContainer.height
|
||||||
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "C"
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.rightMargin: 1
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
size: 26
|
||||||
|
color: simplifiedUI.colors.text.black
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: sadButtonMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled
|
||||||
|
Tablet.playSound(TabletEnu: enabled
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
"source": "EmoteAppBar.qml",
|
||||||
|
"method": "sadPressed"
|
||||||
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: raiseHandButtonContainer
|
||||||
|
width: root.originalWidth
|
||||||
|
height: drawerContainer.height
|
||||||
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "V"
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.rightMargin: 1
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
size: 26
|
||||||
|
color: simplifiedUI.colors.text.black
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: raiseHandButtonMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: enabledTabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
"source": "EmoteAppBar.qml",
|
||||||
|
"method": "raiseHandPressed"
|
||||||
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: applaudButtonContainer
|
||||||
|
width: root.originalWidth
|
||||||
|
height: drawerContainer.height
|
||||||
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "B"
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.rightMargin: 1
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
size: 26
|
||||||
|
color: simplifiedUI.colors.text.black
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: applaudButtonMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: enab
|
||||||
|
"source": "EmoteAppBarled
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
"source": "EmoteAppBar.qml",
|
||||||
|
"method": "applaudPressed"
|
||||||
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: pointButtonContainer
|
||||||
|
width: root.originalWidth
|
||||||
|
height: drawerContainer.height
|
||||||
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "N"
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.rightMargin: 1
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
size: 26
|
||||||
|
color: simplifiedUI.colors.text.black
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: pointButtonMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: enabledoteAppBar.qml",
|
||||||
|
"method": "pointPresse
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
"source": "EmoteAppBar.qml",
|
||||||
|
"method": "pointPressed"
|
||||||
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Rectangle {
|
||||||
|
id: emojiButtonContainer
|
||||||
|
width: root.originalWidth
|
||||||
|
height: drawerContainer.height
|
||||||
|
color: simplifiedUI.colors.white
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "😊"
|
||||||
|
anchors.fill: parent
|
||||||
|
anchors.rightMargin: 1
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
size: 26
|
||||||
|
color: simplifiedUI.colors.text.black
|
||||||
|
}
|
||||||
|
|
||||||
|
MouseArea {
|
||||||
|
id: emojiButtonMouseArea
|
||||||
|
anchors.fill: parent
|
||||||
|
hoverEnabled: enabledggleEmojiApp"
|
||||||
|
});
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Tablet.playSound(TabletEnums.ButtonClick);
|
||||||
|
sendToScript({
|
||||||
|
"source": "EmoteAppBar.qml",
|
||||||
|
"method": "toggleEmojiApp"
|
||||||
|
});
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onEntered: {
|
||||||
|
console.log("ENTERED BUTTON");
|
||||||
|
Tablet.playSound(TabletEnums.ButtonHover);
|
||||||
|
parent.color = simplifiedUI.colors.darkBackground
|
||||||
|
}
|
||||||
|
|
||||||
|
onExited: {
|
||||||
|
parent.color = simplifiedUI.colors.white
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue