Merge pull request #3795 from da-anda/fix-balloontips

[confluence] fix position of stereoscopics and subtitle balloon-tips in video OSD
xbmc · Dec 15, 2013 · 03e8666 · 03e8666
2 parents 349cc46 + 7d5b558
commit 03e8666
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 21 deletions.
diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
@@ -479,10 +479,10 @@
 		</control>
 		<control type="button" id="410">
 			<description>Fake button for mouse control</description>
-			<left>400r</left>
-			<top>350r</top>
+			<right>145</right>
+			<bottom>60</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>250</height>
 			<label>-</label>
 			<font>-</font>
 			<texturenofocus>-</texturenofocus>
@@ -494,10 +494,10 @@
 			<animation effect="fade" time="200">VisibleChange</animation>
 			<animation effect="slide" start="0,0" end="0,80" time="0" condition="![VideoPlayer.HasSubtitles + VideoPlayer.SubtitlesEnabled]">Conditional</animation>
 			<animation effect="slide" start="0,0" end="0,40" time="0" condition="!VideoPlayer.HasSubtitles">Conditional</animation>
-			<left>400r</left>
-			<top>350r</top>
+			<right>145</right>
+			<bottom>45</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>260</height>
 			<itemgap>0</itemgap>
 			<onleft>400</onleft>
 			<onright>400</onright>
@@ -598,10 +598,10 @@
 		<!-- STEREOSCOPIC 3D !LiveTV -->
 		<control type="button" id="520">
 			<description>Fake button for mouse control</description>
-			<left>455r</left>
-			<top>350r</top>
+			<right>200</right>
+			<bottom>60</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>210</height>
 			<label>-</label>
 			<font>-</font>
 			<texturenofocus>-</texturenofocus>
@@ -611,10 +611,10 @@
 		<control type="grouplist" id="500">
 			<visible>VideoPlayer.IsStereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<left>455r</left>
-			<top>350r</top>
+			<right>200</right>
+			<bottom>45</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>220</height>
 			<itemgap>0</itemgap>
 			<onleft>500</onleft>
 			<onright>500</onright>
@@ -697,10 +697,10 @@
 		<!-- STEREOSCOPIC 3D LiveTV -->
 		<control type="button" id="570">
 			<description>Fake button for mouse control</description>
-			<left>340r</left>
-			<top>350r</top>
+			<right>145</right>
+			<bottom>60</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>210</height>
 			<label>-</label>
 			<font>-</font>
 			<texturenofocus>-</texturenofocus>
@@ -710,10 +710,10 @@
 		<control type="grouplist" id="550">
 			<visible>videoplayer.isstereoscopic + ![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide)]</visible>
 			<animation effect="fade" time="200">VisibleChange</animation>
-			<left>340r</left>
-			<top>350r</top>
+			<right>145</right>
+			<bottom>45</bottom>
 			<width>256</width>
-			<height>300</height>
+			<height>220</height>
 			<itemgap>0</itemgap>
 			<onleft>550</onleft>
 			<onright>550</onright>
@@ -794,4 +794,4 @@
 			</control>
 		</control>
 	</controls>
-</window>
+</window>
diff --git a/addons/skin.confluence/720p/defaults.xml b/addons/skin.confluence/720p/defaults.xml
@@ -20,8 +20,6 @@
 		<disabledcolor>grey3</disabledcolor>
 	</default>
 	<default type="button">
-		<left>300</left>
-		<top>200</top>
 		<width>300</width>
 		<height>42</height>
 		<texturefocus border="5">button-focus.png</texturefocus>