aboutsummaryrefslogtreecommitdiff
path: root/skin
diff options
context:
space:
mode:
authorjezz_x <jezz_x@svn>2009-12-15 22:05:48 +0000
committerjezz_x <jezz_x@svn>2009-12-15 22:05:48 +0000
commit4ace4251cccabd3fc00820d5097f1e25b0a4c723 (patch)
treeb5677933a0268e43d7e735217aa78cc415cd968b /skin
parentb2b85b4223ecefdba3cb1ff9b4dee7a09409bbd8 (diff)
Fixed: [Confluence] Browsing for subtitles in full screen video overlayed too many transparent windows. takes care of ticket #8142 and cleans up some old unneeded code
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@25757 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'skin')
-rw-r--r--skin/Confluence/720p/FileBrowser.xml16
-rw-r--r--skin/Confluence/720p/VideoOSDSettings.xml2
2 files changed, 3 insertions, 15 deletions
diff --git a/skin/Confluence/720p/FileBrowser.xml b/skin/Confluence/720p/FileBrowser.xml
index 7c5c015b4b..121d309b40 100644
--- a/skin/Confluence/720p/FileBrowser.xml
+++ b/skin/Confluence/720p/FileBrowser.xml
@@ -9,19 +9,16 @@
<controls>
<control type="group">
<posx>580</posx>
- <animation effect="slide" start="700,0" end="0,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation) | Window.IsVisible(124)]">WindowOpen</animation>
+ <animation effect="slide" start="700,0" end="0,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation>
<animation effect="slide" start="-400,0" end="0,0" time="400" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowOpen</animation>
- <animation effect="slide" start="100,0" end="0,0" time="200" tween="quadratic" easing="out" condition="Window.IsVisible(124)">WindowOpen</animation>
- <animation effect="slide" start="0,0" end="700,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation) | Window.IsVisible(124)]">WindowClose</animation>
+ <animation effect="slide" start="0,0" end="700,0" time="400" tween="quadratic" easing="out" condition="![Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation>
<animation effect="slide" start="0,0" end="-400,0" time="400" tween="quadratic" easing="out" condition="[Window.IsVisible(MovieInformation) | Window.IsVisible(MusicInformation)]">WindowClose</animation>
- <animation effect="slide" start="0,0" end="100,0" time="200" tween="quadratic" easing="out" condition="Window.IsVisible(124)">WindowClose</animation>
<control type="image">
<posx>0</posx>
<posy>0</posy>
<width>1100</width>
<height>720</height>
<texture border="15,0,0,0" flipx="true">MediaBladeSub.png</texture>
- <visible>!Window.IsVisible(124)</visible>
</control>
<control type="button">
<description>Close Window button</description>
@@ -40,15 +37,6 @@
<ondown>450</ondown>
<visible>system.getbool(input.enablemouse)</visible>
</control>
- <control type="image">
- <description>media info background image</description>
- <posx>0</posx>
- <posy>0</posy>
- <width>800</width>
- <height>720</height>
- <texture border="20,0,0,0" flipx="true">VisOsdPanel.png</texture>
- <visible>Window.IsVisible(124)</visible>
- </control>
<control type="group">
<animation effect="fade" delay="400" start="0" end="100" time="200">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="200">WindowClose</animation>
diff --git a/skin/Confluence/720p/VideoOSDSettings.xml b/skin/Confluence/720p/VideoOSDSettings.xml
index c0ef957757..b88705c65e 100644
--- a/skin/Confluence/720p/VideoOSDSettings.xml
+++ b/skin/Confluence/720p/VideoOSDSettings.xml
@@ -9,7 +9,7 @@
<include>dialogeffect</include>
<controls>
<control type="group">
- <animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog)">Conditional</animation>
+ <animation effect="fade" start="100" end="0" time="400" condition="Window.IsVisible(SliderDialog) | Window.IsVisible(FileBrowser)">Conditional</animation>
<control type="image">
<description>background image</description>
<posx>0</posx>