From 5d8781d532415d0b7d0cc227db6078231e378e9b Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sun, 6 Jun 2021 15:37:31 +0100
Subject: [PATCH] music fullscreen rework

---
 1080i/Includes_hubMenu.xml               | 122 +++++++++++++++-
 1080i/Includes_variables.xml             |   2 +-
 1080i/custom_musicFullscreenDisabler.xml |   2 +-
 1080i/custom_musicPlayerFullscreen.xml   | 174 +----------------------
 shortcuts/musicsubmenu.DATA.xml          |   2 +-
 5 files changed, 128 insertions(+), 174 deletions(-)

diff --git a/1080i/Includes_hubMenu.xml b/1080i/Includes_hubMenu.xml
index 80cc9b3..7bc789b 100644
--- a/1080i/Includes_hubMenu.xml
+++ b/1080i/Includes_hubMenu.xml
@@ -51,14 +51,130 @@
 	                <label>$VAR[menuLogo]</label>
 	            </control>
 			</control>
-            <control type="list" id="9001">
+
+            <!--player controls (if media playing)-->
+            <control type="group">
+                <posx>0</posx>
+                <posy>row-5-begin</posy>
+
+                <control type="image">
+                    <visible>player.playing + control.hasfocus(5115)</visible>
+                    <posx>0</posx>
+                    <posy>0</posy>
+                    <width>col-5-begin</width>
+                    <height>1-col</height>
+                    <aspectratio>stretch</aspectratio>
+                    <texture>colors/white.png</texture>
+                </control>
+
+                <control type="panel" id="5115">
+                    <visible>player.playing</visible>
+                    <posx>72</posx>
+                    <posy>0</posy>
+                    <width>col-5-begin</width>
+                    <height>2-row</height>
+                    <itemgap>0</itemgap>
+                    <ondown>Control.SetFocus(9001)</ondown>
+                    <onright condition="!window.isactive(1103)">9999</onright>
+                    <onright condition="window.isactive(1103)">control.setfocus(9876)</onright>
+                    <orientation>horizontal</orientation>
+                    <itemlayout width="1-col" height="2-row">
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label2]</label>
+                        </control>
+                        <control type="label">
+                            <visible>control.hasfocus(5115)</visible>
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>highlight</textcolor>
+                            <label>$INFO[ListItem.label2]</label>
+                        </control>
+                    </itemlayout>
+                    <focusedlayout width="1-col" height="2-row">
+                        <control type="image">
+                            <posx>3</posx>
+                            <posy>3</posy>
+                            <width>66</width>
+                            <height>66</height>
+                            <aspectratio>stretch</aspectratio>
+                            <texture>colors/white.png</texture>
+                            <colordiffuse>highlight</colordiffuse>
+                        </control>
+                        <control type="label">
+                            <posx>0</posx>
+                            <posy>0</posy>
+                            <width>1-col</width>
+                            <height>2-row</height>
+                            <align>center</align>
+                            <aligny>center</aligny>
+                            <font>symbol</font>
+                            <textcolor>textActive</textcolor>
+                            <label>$INFO[ListItem.label2]</label>
+                            <shadowcolor></shadowcolor>
+                        </control>
+                    </focusedlayout>
+                    <content>
+                        <item>
+                            <description>Previous</description>
+                            <label2></label2>
+                            <thumb></thumb>
+                            <onclick>PlayerControl(previous)</onclick>
+                        </item>
+                        <item>
+                            <description>Stop</description>
+                            <label2></label2>
+                            <thumb></thumb>
+                            <onclick>PlayerControl(stop)</onclick>
+                            <onclick>Dialog.Close(1103)</onclick>
+                        </item>
+                        <item>
+                            <visible>Player.Playing | player.forwarding | player.rewinding</visible>
+                            <description>Play/Pause</description>
+                            <label2></label2>
+                            <thumb></thumb>
+                            <onclick>PlayerControl(play)</onclick>
+                        </item>
+                        <item>
+                            <visible>Player.Paused</visible>
+                            <description>Pause</description>
+                            <label2></label2>
+                            <thumb></thumb>
+                            <onclick>PlayerControl(play)</onclick>
+                        </item>
+                        <item>
+                            <description>Next Chapter</description>
+                            <label2></label2>
+                            <thumb></thumb>
+                            <onclick>PlayerControl(next)</onclick>
+                        </item>
+                    </content>
+                </control>
+            </control>
+
+            <control type="panel" id="9001">
+                <animation condition="player.playing" effect="slide" end="0,72" time="0">conditional</animation>
                 <posx>0</posx>
                 <posy>row-5-begin</posy>
                 <width>col-5-begin</width>
                 <height>832</height>
                 <orientation>vertical</orientation>
                 <onleft condition="!window.isactive(home)">activateWindow(contextmenu)</onleft>
-                <onright>9999</onright>
+                <onright condition="!window.isactive(1103)">9999</onright>
+                <onright condition="window.isactive(1103)">9876</onright>
+                <onup condition="control.isvisible(5115)">control.setfocus(5115)</onup>
                 <onback>activateWindow(home)</onback>
                 <itemlayout width="col-5-begin" height="2-row">
                     <control type="label">
@@ -97,7 +213,7 @@
                 <content>
                     <include condition="window.isactive(games)">skinshortcuts-group-gamesubmenu</include>
 					<include condition="window.isactive(pictures)">skinshortcuts-group-picturessubmenu</include>
-                    <include condition="String.Contains(container.folderpath,videodb://musicvideos/titles) | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist)">skinshortcuts-group-musicsubmenu</include>
+                    <include condition="String.Contains(container.folderpath,videodb://musicvideos/titles) | window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist) | window.isactive(1103)">skinshortcuts-group-musicsubmenu</include>
                     <include condition="[window.isactive(videos) + !String.Contains(container.folderpath,videodb://musicvideos/titles)] | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers) | window.isactive(videoplaylist)">skinshortcuts-group-videosubmenu</include>
                 </content>
             </control>
diff --git a/1080i/Includes_variables.xml b/1080i/Includes_variables.xml
index 6cf158c..342bc9e 100644
--- a/1080i/Includes_variables.xml
+++ b/1080i/Includes_variables.xml
@@ -103,7 +103,7 @@
     <variable name="menuLogo">
         <value condition="Window.IsActive(games)"></value>
 		<value condition="Window.IsActive(pictures)"></value>
-        <value condition="window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist)"></value>
+        <value condition="window.isactive(music) | window.isactive(radiochannels) | window.isactive(radioguide) | window.isactive(radiorecordings) | window.isactive(radiotimers) | window.isactive(musicplaylist) | window.isactive(1103)"></value>
         <value condition="window.isactive(videos) | window.isactive(tvchannels) | window.isactive(tvrecordings) | window.isactive(tvguide) | window.isactive(tvtimers) | window.isactive(videoplaylist)"></value>
     </variable>
     <!--extra fanart sourcing-->
diff --git a/1080i/custom_musicFullscreenDisabler.xml b/1080i/custom_musicFullscreenDisabler.xml
index 0b9ea3a..0ea49ad 100644
--- a/1080i/custom_musicFullscreenDisabler.xml
+++ b/1080i/custom_musicFullscreenDisabler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="dialog" id="1101">
-    <onload>Dialog.Close(all)</onload>
+    <onload>action(back)</onload>
     <visible>Window.IsActive(1103) + !player.playing + !player.paused</visible>
     <controls>
         <!--debugging-->
diff --git a/1080i/custom_musicPlayerFullscreen.xml b/1080i/custom_musicPlayerFullscreen.xml
index aa201d2..42596ee 100644
--- a/1080i/custom_musicPlayerFullscreen.xml
+++ b/1080i/custom_musicPlayerFullscreen.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window type="dialog" id="1103">
+<window id="1103">
 	<defaultcontrol always="true">9876</defaultcontrol>
 	<onunload>control.setfocus(9999)</onunload>
 	<controls>
@@ -130,170 +130,6 @@
 						<shadowcolor>99000000</shadowcolor>
 					</control>
 				</control>		
-				<!--player controls and options-->
-				<control type="group">
-					<posy>738</posy>
-					<control type="image">
-	                    <posx>-96</posx>
-	                    <posy>0</posy>
-	                    <width>fullscreenWidth</width>
-	                    <height>5-row</height>
-	                    <texture>colors/black.png</texture>
-	                    <colordiffuse>88ffffff</colordiffuse>
-	                    <aspectratio>stretch</aspectratio>
-	                </control>
-					<!--player controls-->
-					<control type="panel" id="8001">
-						<posx>-48</posx>
-		                <posy>6</posy>
-		                <width>7-col</width>
-		                <height>2-row</height>
-		                <itemgap>0</itemgap>
-		                <onright>8002</onright>
-		                <onup>Control.SetFocus(9876)</onup>
-		                <orientation>horizontal</orientation>
-		                <itemlayout width="1-col" height="2-row">
-		                    <control type="label">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <align>center</align>
-		                        <aligny>center</aligny>
-		                        <font>symbol</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label2]</label>
-		                    </control>
-		                </itemlayout>
-		                <focusedlayout width="1-col" height="2-row">
-		                    <control type="image">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>69</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture>colors/white.png</texture>
-								<colordiffuse>highlight</colordiffuse>
-		                    </control>
-		                    <control type="label">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <align>center</align>
-		                        <aligny>center</aligny>
-		                        <font>symbol</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label2]</label>
-		                        <shadowcolor></shadowcolor>
-		                    </control>
-		                </focusedlayout>
-		                <content>
-		                    <item>
-		                        <description>Playlist</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>activateWindow(musicplaylist)</onclick>
-		                    </item>
-		                    <item>
-		                        <description>Previous</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(previous)</onclick>
-		                    </item>
-		                    <item>
-		                        <description>Stop</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(stop)</onclick>
-		                        <onclick>Dialog.Close(1103)</onclick>
-		                    </item>
-		                    <item>
-		                        <visible>Player.Playing | player.forwarding | player.rewinding</visible>
-		                        <description>Play/Pause</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(play)</onclick>
-		                    </item>
-		                    <item>
-		                        <visible>Player.Paused</visible>
-		                        <description>Pause</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(play)</onclick>
-		                    </item>
-		                    <item>
-		                        <description>Next Chapter</description>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>PlayerControl(next)</onclick>
-		                    </item>
-		                </content>
-		            </control>
-		            <!--final options-->
-		            <control type="panel" id="8002">
-		                <posx>23-col</posx>
-		                <posy>6</posy>
-		                <width>20-col</width>
-		                <height>2-row</height>
-		                <orientation>horizontal</orientation>
-		                <onup>Control.SetFocus(9876)</onup>
-		                <onleft>Control.SetFocus(8001,4)</onleft>
-		                <itemlayout width="1-col" height="2-row">
-		                    <control type="label">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <align>center</align>
-		                        <aligny>center</aligny>
-		                        <font>symbol</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label2]</label>
-		                    </control>
-		                </itemlayout>
-		                <focusedlayout width="1-col" height="2-row">
-		                    <control type="image">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>69</height>
-		                        <aspectratio>stretch</aspectratio>
-		                        <texture>colors/white.png</texture>
-								<colordiffuse>highlight</colordiffuse>
-		                    </control>
-		                    <control type="label">
-		                        <posx>0</posx>
-		                        <posy>0</posy>
-		                        <width>1-col</width>
-		                        <height>2-row</height>
-		                        <align>center</align>
-		                        <aligny>center</aligny>
-		                        <font>symbol</font>
-		                        <textcolor>textActive</textcolor>
-		                        <label>$INFO[ListItem.label2]</label>
-		                        <shadowcolor></shadowcolor>
-		                    </control>
-		                </focusedlayout>
-		                <content>
-		                    <item>
-		                        <description>Visualisation</description>
-		                        <label>250</label>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>activateWindow(musicOSD)</onclick>
-		                    </item>
-		                    <item>
-		                        <visible>Visualisation.HasPresets</visible>
-		                        <description>Visualisation Settings</description>
-		                        <label>$LOCALIZE[21417]</label>
-		                        <label2></label2>
-		                        <thumb></thumb>
-		                        <onclick>Addon.Default.OpenSettings(xbmc.player.musicviz)</onclick>
-		                    </item>
-		                </content>
-		            </control>
-				</control>
 			</control>
 		</control>
 		<!--hidden buttons to handle dialog autohide-->
@@ -302,10 +138,12 @@
 			<posy>-100</posy>
 			<height>1-col</height>
 			<width>1-col</width>
-			<onclick>control.setfocus(8001)</onclick>
-			<ondown>control.setfocus(8001)</ondown>
-			<oninfo>control.setfocus(8001)</oninfo>
+			<onclick>control.setfocus(9000)</onclick>
+			<onleft>control.setfocus(9000)</onleft>
+			<oninfo>control.setfocus(9000)</oninfo>
 		</control>
+		<!--hub menu-->
+        <include>hubMenu</include>
 		<!--debugging-->
 		<include>DebugGrid</include>
 		<control type="label">
diff --git a/shortcuts/musicsubmenu.DATA.xml b/shortcuts/musicsubmenu.DATA.xml
index 5d81568..5879709 100644
--- a/shortcuts/musicsubmenu.DATA.xml
+++ b/shortcuts/musicsubmenu.DATA.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shortcuts>
     <shortcut>
-        <visible>Player.HasMedia</visible>
+        <visible>Player.HasMedia + !window.isactive(1103)</visible>
         <label>31136</label>
         <label2>10005</label2>
         <icon>DefaultAddon.png</icon>