From f2b0e47c39aa56d7277dc237a60a6b497939b50e Mon Sep 17 00:00:00 2001 From: Wayne Chen Date: Thu, 28 Mar 2019 16:19:35 -0700 Subject: [PATCH] changing opacity --- interface/resources/qml/BubbleIcon.qml | 6 +++--- .../resources/qml/hifi/audio/MicBarApplication.qml | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/BubbleIcon.qml b/interface/resources/qml/BubbleIcon.qml index 430eb19860..f4e99f136c 100644 --- a/interface/resources/qml/BubbleIcon.qml +++ b/interface/resources/qml/BubbleIcon.qml @@ -24,9 +24,9 @@ Rectangle { function updateOpacity() { if (ignoreRadiusEnabled) { - bubbleRect.opacity = 0.7; + bubbleRect.opacity = 1.0; } else { - bubbleRect.opacity = 0.3; + bubbleRect.opacity = 0.7; } } @@ -74,7 +74,7 @@ Rectangle { } drag.target: dragTarget; onContainsMouseChanged: { - var rectOpacity = ignoreRadiusEnabled ? (containsMouse ? 0.9 : 0.7) : (containsMouse ? 0.5 : 0.3); + var rectOpacity = (ignoreRadiusEnabled && containsMouse) ? 1.0 : (containsMouse ? 1.0 : 0.7); if (containsMouse) { Tablet.playSound(TabletEnums.ButtonHover); } diff --git a/interface/resources/qml/hifi/audio/MicBarApplication.qml b/interface/resources/qml/hifi/audio/MicBarApplication.qml index a39707e052..6bb418688e 100644 --- a/interface/resources/qml/hifi/audio/MicBarApplication.qml +++ b/interface/resources/qml/hifi/audio/MicBarApplication.qml @@ -51,14 +51,14 @@ Rectangle { height: 44; radius: 5; - opacity: 0.7 + opacity: 0.7; onLevelChanged: { - var rectOpacity = muted && (level >= userSpeakingLevel) ? 0.9 : 0.3; + var rectOpacity = muted && (level >= userSpeakingLevel) ? 1.0 : 0.7; if (pushToTalk && !pushingToTalk) { - rectOpacity = (level >= userSpeakingLevel) ? 0.9 : 0.7; - } else if (mouseArea.containsMouse && rectOpacity != 0.9) { - rectOpacity = 0.5; + rectOpacity = (level >= userSpeakingLevel) ? 1.0 : 0.7; + } else if (mouseArea.containsMouse && rectOpacity != 1.0) { + rectOpacity = 1.0; } micBar.opacity = rectOpacity; }