Added: [Confluence] Close full screen playback (minimize) buttons to top right MusicOSD.xml and VideoOSD.xml. Useful for Mouse users or people with limited remotes (you can navigate to it)

1 files changed, 42 insertions, 22 deletions

diff --git a/addons/skin.confluence/720p/VideoOSD.xml b/addons/skin.confluence/720p/VideoOSD.xml
index 904b01248e..60ef158d1c 100644
--- a/addons/skin.confluence/720p/VideoOSD.xml
+++ b/addons/skin.confluence/720p/VideoOSD.xml
@@ -7,6 +7,26 @@
 		<posy>0</posy>
 	</coordinates>
 	<controls>
+		<control type="button" id="1000">
+			<description>Close Window button</description>
+			<posx>84r</posx>
+			<posy>0</posy>
+			<width>64</width>
+			<height>32</height>
+			<label>-</label>
+			<font>-</font>
+			<onclick>Dialog.Close(VideoOSD,true)</onclick>
+			<onclick>FullScreen</onclick>
+			<texturefocus>DialogCloseButton-focus.png</texturefocus>
+			<texturenofocus>DialogCloseButton.png</texturenofocus>
+			<onleft>1000</onleft>
+			<onright>1000</onright>
+			<onup>100</onup>
+			<ondown>100</ondown>
+			<visible>system.getbool(input.enablemouse)</visible>
+			<animation effect="fade" time="200">VisibleChange</animation>
+			<visible>![Window.IsVisible(SliderDialog) | Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks)]</visible>
+		</control>
 		<control type="slider" id="87">
 			<description>Seek Slider</description>
 			<posx>430</posx>
@@ -38,8 +58,8 @@
 				<texturenofocus>OSDPrevTrackNF.png</texturenofocus>
 				<onleft>705</onleft>
 				<onright>601</onright>
-				<onup>600</onup>
-				<ondown>600</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Previous)</onclick>
 			</control>
 			<control type="button" id="601">
@@ -53,8 +73,8 @@
 				<texturenofocus>OSDRewindNF.png</texturenofocus>
 				<onleft>600</onleft>
 				<onright>602</onright>
-				<onup>601</onup>
-				<ondown>601</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Rewind)</onclick>
 			</control>
 			<control type="togglebutton" id="602">
@@ -72,8 +92,8 @@
 				<alttexturenofocus>OSDPlayNF.png</alttexturenofocus>
 				<onleft>601</onleft>
 				<onright>603</onright>
-				<onup>602</onup>
-				<ondown>602</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Play)</onclick>
 			</control>
 			<control type="button" id="603">
@@ -87,8 +107,8 @@
 				<texturenofocus>OSDStopNF.png</texturenofocus>
 				<onleft>602</onleft>
 				<onright>604</onright>
-				<onup>603</onup>
-				<ondown>603</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Stop)</onclick>
 			</control>
 			<control type="button" id="604">
@@ -102,8 +122,8 @@
 				<texturenofocus>OSDForwardNF.png</texturenofocus>
 				<onleft>603</onleft>
 				<onright>605</onright>
-				<onup>604</onup>
-				<ondown>604</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Forward)</onclick>
 			</control>
 			<control type="button" id="605">
@@ -117,8 +137,8 @@
 				<texturenofocus>OSDNextTrackNF.png</texturenofocus>
 				<onleft>604</onleft>
 				<onright>701</onright>
-				<onup>605</onup>
-				<ondown>605</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(Next)</onclick>
 			</control>
 		</control>
@@ -140,8 +160,8 @@
 				<alttexturenofocus>OSDSubtitlesNF.png</alttexturenofocus>
 				<onleft>605</onleft>
 				<onright>702</onright>
-				<onup>701</onup>
-				<ondown>701</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>Close</onclick>
 				<onclick>XBMC.RunScript($INFO[Skin.String(SubtitleScript_Path)])</onclick>
 				<altclick>Skin.SetAddon(SubtitleScript_Path,xbmc.python.subtitles)</altclick>
@@ -160,8 +180,8 @@
 				<texturenofocus>OSDVideoNF.png</texturenofocus>
 				<onleft>701</onleft>
 				<onright>703</onright>
-				<onup>702</onup>
-				<ondown>702</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>ActivateWindow(OSDVideoSettings)</onclick>
 			</control>
 			<control type="button" id="703">
@@ -175,8 +195,8 @@
 				<texturenofocus>OSDAudioNF.png</texturenofocus>
 				<onleft>702</onleft>
 				<onright>704</onright>
-				<onup>703</onup>
-				<ondown>703</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>ActivateWindow(OSDAudioSettings)</onclick>
 			</control>
 			<control type="button" id="704">
@@ -190,8 +210,8 @@
 				<texturenofocus>OSDBookmarksNF.png</texturenofocus>
 				<onleft>703</onleft>
 				<onright>705</onright>
-				<onup>704</onup>
-				<ondown>704</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>ActivateWindow(VideoBookmarks)</onclick>
 			</control>
 			<control type="button" id="705">
@@ -205,8 +225,8 @@
 				<texturenofocus>OSDDvdNF.png</texturenofocus>
 				<onleft>704</onleft>
 				<onright>600</onright>
-				<onup>704</onup>
-				<ondown>704</ondown>
+				<onup>1000</onup>
+				<ondown>1000</ondown>
 				<onclick>PlayerControl(ShowVideoMenu)</onclick>
 				<enable>VideoPlayer.HasMenu</enable>
 				<animation effect="fade" start="100" end="50" time="100" condition="!VideoPlayer.HasMenu">Conditional</animation>