aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartijn Kaijser <martijn@xbmc.org>2015-07-19 13:33:43 +0200
committerMartijn Kaijser <martijn@xbmc.org>2015-07-19 13:33:43 +0200
commit45bb758c651fe194796a815042692d57f21ef085 (patch)
tree360ff87e71348b79b30e7e9d8cc5ad702e325ea9
parentde73966842adb87da481ae1110a0d94a6f34fdbd (diff)
parentbe4496fc79e6258b7b56c3da796f2fae70c7e96b (diff)
Merge pull request #7529 from uNiversaI/audio
[confluence] fix overlapping mutebug on musicvisualization and OSD
-rw-r--r--addons/skin.confluence/720p/MusicOSD.xml1
-rw-r--r--addons/skin.confluence/720p/MusicVisualisation.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/addons/skin.confluence/720p/MusicOSD.xml b/addons/skin.confluence/720p/MusicOSD.xml
index 636e37420a..bdfbfcdce6 100644
--- a/addons/skin.confluence/720p/MusicOSD.xml
+++ b/addons/skin.confluence/720p/MusicOSD.xml
@@ -26,6 +26,7 @@
<onup>100</onup>
<ondown>100</ondown>
<animation effect="fade" time="150">VisibleChange</animation>
+ <animation effect="slide" start="0,0" end="-30,0" time="0" condition="Window.IsVisible(Mutebug)">conditional</animation>
<visible>![Window.IsVisible(AddonSettings) | Window.IsVisible(SelectDialog) | Window.IsVisible(VisualisationPresetList) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
</control>
<control type="slider" id="87">
diff --git a/addons/skin.confluence/720p/MusicVisualisation.xml b/addons/skin.confluence/720p/MusicVisualisation.xml
index c925d8bbc4..6430cb97d8 100644
--- a/addons/skin.confluence/720p/MusicVisualisation.xml
+++ b/addons/skin.confluence/720p/MusicVisualisation.xml
@@ -73,6 +73,7 @@
<textcolor>white</textcolor>
<shadowcolor>black</shadowcolor>
<label>$INFO[System.Time]</label>
+ <animation effect="slide" start="0,0" end="-30,0" time="0" condition="Window.IsVisible(Mutebug)">conditional</animation>
<animation effect="slide" start="0,0" end="-70,0" time="0" condition="Window.IsVisible(MusicOSD)">conditional</animation>
</control>
<control type="image">