Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-19 13:44:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

adding more opacity, cleanup

Browse source
This commit is contained in:
Wayne Chen 2019-02-27 17:38:11 -08:00
parent ddacc0ee60
commit e129201d2a
2 changed files with 64 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
interface/resources/qml/AvatarInputsBar.qml
View file

@ -7,11 +7,13 @@
//
import Hifi 1.0 as Hifi
import QtQuick 2.4
import QtQuick 2.5
import QtGraphicalEffects 1.0
import "./hifi/audio" as HifiAudio
import TabletScriptingInterface 1.0
Item {
id: root;
objectName: "AvatarInputsBar"
@ -19,7 +21,8 @@ Item {
readonly property bool ignoreRadiusEnabled: AvatarInputs.ignoreRadiusEnabled
width: audio.width;
height: audio.height;
x: 10; y: 5;
x: 10;
y: 5;
readonly property bool shouldReposition: true;
HifiAudio.MicBarApplication {
@ -28,22 +31,58 @@ Item {
standalone: true;
dragTarget: parent;
}
Image {
id: bubbleIcon
source: "../icons/tablet-icons/bubble-i.svg";
width: 28;
height: 28;
Rectangle {
id: bubbleRect
width: bubbleIcon.width + 10
height: parent.height
radius: 5;
opacity: 0.5;
color: "#00000000";
border {
width: mouseArea.containsMouse || mouseArea.containsPress ? 2 : 0;
color: "#80FFFFFF";
}
anchors {
left: root.right
top: root.top
topMargin: (root.height - bubbleIcon.height) / 2
}
MouseArea {
id: mouseArea;
anchors.fill: parent
hoverEnabled: true;
scrollGestureEnabled: false;
onClicked: {
Tablet.playSound(TabletEnums.ButtonClick);
}
drag.target: root;
onContainsMouseChanged: {
if (containsMouse) {
Tablet.playSound(TabletEnums.ButtonHover);
bubbleRect.opacity = 0.7;
} else {
bubbleRect.opacity = 0.5;
}
}
}
Image {
id: bubbleIcon
source: "../icons/tablet-icons/bubble-i.svg";
sourceSize: Qt.size(28, 28);
smooth: true;
visible: false
anchors.top: parent.top
anchors.topMargin: (parent.height - bubbleIcon.height) / 2
anchors.left: parent.left
anchors.leftMargin: (parent.width - bubbleIcon.width) / 2
}
ColorOverlay {
id: bubbleIconOverlay
anchors.fill: bubbleIcon
source: bubbleIcon
color: AvatarInputs.ignoreRadiusEnabled ? "#1FC6A6" : "#FFFFFF";
}
}
ColorOverlay {
id: bubbleIconOverlay
anchors.fill: bubbleIcon
source: bubbleIcon
color: AvatarInputs.ignoreRadiusEnabled ? "#1FC6A6" : "#FFFFFF";
opacity: 0.3
}
}

10
interface/resources/qml/hifi/audio/MicBarApplication.qml
View file

@ -32,6 +32,14 @@ Rectangle {
radius: 5;
onLevelChanged: {
var rectOpacity = AudioScriptingInterface.muted && (level >= userSpeakingLevel)? 0.9 : 0.3;
if (mouseArea.containsMouse) {
rectOpacity = 0.5;
}
opacity = rectOpacity;
}
color: "#00000000";
border {
width: mouseArea.containsMouse || mouseArea.containsPress ? 2 : 0;
@ -121,6 +129,7 @@ Rectangle {
}
ColorOverlay {
id: imageOverlay
anchors { fill: image }
source: image;
color: colors.icon;
@ -170,6 +179,7 @@ Rectangle {
height: 32;
Rectangle { // base
id: baseBar
radius: 4;
anchors { fill: parent }
color: colors.gutter;