git.iko.soy/unity8
on xenial help sign in
hide the volume notification iff the indicator bar is expanded and the current indicator is sound
ba738aeLukáš Tinkl
qml/Components/VolumeControl.qml+6−7
compare with xenial
unifiedsplit
@@ -47,13 +47,12 @@ Item {
47 }
47 }
48
48
49 Connections {
49 Connections {
50− target: indicators
51− onFullyOpenedChanged: { // disallow the volume notification when using the slider
50+ target: indicators // disallow the volume notification when using the slider, lpbug#1484126
52− if (indicators.fullyOpened) {
51+ onFullyOpenedChanged: {
53− actionGroup.indicatorsAction.updateState(true);
52+ actionGroup.indicatorsAction.updateState(indicators.fullyOpened && indicators.currentIndicator === "indicator-sound");
54− } else {
53+ }
54+ onCurrentIndicatorChanged: {
55− actionGroup.indicatorsAction.updateState(false);
55+ actionGroup.indicatorsAction.updateState(indicators.fullyOpened && indicators.currentIndicator === "indicator-sound");
56− }
57 }
56 }
58 }
57 }
59
58
qml/Panel/IndicatorsBar.qml+1
@@ -28,6 +28,7 @@ Item {
28 property alias overFlowWidth: row.overFlowWidth
28 property alias overFlowWidth: row.overFlowWidth
29 readonly property alias currentItemIndex: row.currentItemIndex
29 readonly property alias currentItemIndex: row.currentItemIndex
30 property real lateralPosition: -1
30 property real lateralPosition: -1
31+ readonly property string currentIndicator: row.currentItem ? row.currentItem.identifier : ""
31
32
32 function selectItemAt(lateralPosition) {
33 function selectItemAt(lateralPosition) {
33 if (!expanded) {
34 if (!expanded) {
qml/Panel/IndicatorsMenu.qml+1
@@ -27,6 +27,7 @@ Showable {
27 property alias hideDragHandle: __hideDragHandle
27 property alias hideDragHandle: __hideDragHandle
28 property alias overFlowWidth: bar.overFlowWidth
28 property alias overFlowWidth: bar.overFlowWidth
29 property alias verticalVelocityThreshold: yVelocityCalculator.velocityThreshold
29 property alias verticalVelocityThreshold: yVelocityCalculator.velocityThreshold
30+ property alias currentIndicator: bar.currentIndicator
30 property int minimizedPanelHeight: units.gu(3)
31 property int minimizedPanelHeight: units.gu(3)
31 property int expandedPanelHeight: units.gu(7)
32 property int expandedPanelHeight: units.gu(7)
32 property real openedHeight: units.gu(71)
33 property real openedHeight: units.gu(71)