From 5ef005d1dbe0b87f4fb92f30ea107586e2c39241 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sat, 13 Mar 2021 15:29:42 +0000
Subject: [PATCH] various matrix tweaks

---
 1080i/AddonBrowser.xml            |  2 +-
 1080i/DialogMusicInfo.xml         |  8 ++++
 1080i/DialogPVRChannelManager.xml | 60 ++++++++-----------------
 1080i/DialogPVRGroupManager.xml   | 73 ++++++++++++++-----------------
 1080i/DialogSubtitles.xml         | 40 +++++------------
 1080i/FileBrowser.xml             |  8 ++--
 1080i/FileManager.xml             | 19 ++++----
 7 files changed, 83 insertions(+), 127 deletions(-)

diff --git a/1080i/AddonBrowser.xml b/1080i/AddonBrowser.xml
index 6e5409e..87a333d 100644
--- a/1080i/AddonBrowser.xml
+++ b/1080i/AddonBrowser.xml
@@ -48,7 +48,7 @@
                     <posx>0</posx>
                     <posy>84</posy>
                     <width>8-col</width>
-                    <height>20-row</height>
+                    <height>18-row</height>
                     <onleft>activateWindow(contextmenu)</onleft>
                     <ondown>50</ondown>
                     <onup>50</onup>
diff --git a/1080i/DialogMusicInfo.xml b/1080i/DialogMusicInfo.xml
index 0e975bf..2dd0031 100644
--- a/1080i/DialogMusicInfo.xml
+++ b/1080i/DialogMusicInfo.xml
@@ -10,6 +10,14 @@
 			<posx>0</posx>
 			<posy>0</posy>
 			<include>globalBackground</include>
+			<control type="image">
+				<posx>0</posx>
+				<posy>0</posy>
+				<include>dimensionsFullscreen</include>
+				<texture>colors/black.png</texture>
+				<colordiffuse>ccffffff</colordiffuse>
+				<aspectratio>stretch</aspectratio>
+			</control>
 			<!--fanart-->
 			<control type="image">
 				<visible>!container.content(albums)</visible>
diff --git a/1080i/DialogPVRChannelManager.xml b/1080i/DialogPVRChannelManager.xml
index 50593ae..35f68f6 100644
--- a/1080i/DialogPVRChannelManager.xml
+++ b/1080i/DialogPVRChannelManager.xml
@@ -15,7 +15,7 @@
                     <posx>-12</posx>
                     <posy>-12</posy>
                     <width>1608</width>
-                    <height>852</height>
+                    <height>864</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -31,11 +31,10 @@
                 </control>
 				<control type="image">
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>22-col</width>
+                    <posy>84</posy>
+                    <width>16-col</width>
                     <height>71</height>
-                    <texture>colors/black.png</texture>
-					<colordiffuse>overlay</colordiffuse>
+                    <texture>colors/offblack.png</texture>
                     <aspectratio>stretch</aspectratio>
                 </control>
                 <control type="label">
@@ -66,7 +65,7 @@
                 <control type="label">
                     <description>name label</description>
                     <posx>24</posx>
-                    <posy>2-row</posy>
+                    <posy>84</posy>
                     <width>8-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -76,17 +75,17 @@
                 </control>
                 <control type="list" id="20">
                     <posx>0</posx>
-                    <posy>156</posy>
+                    <posy>168</posy>
                     <width>564</width>
-                    <height>19-row</height>
+                    <height>672</height>
                     <onright>7</onright>
-                    <itemlayout height="84" width="8-col">
+                    <itemlayout height="72" width="8-col">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
                         </control>
                         <control type="label">
@@ -101,13 +100,13 @@
                             <label>$INFO[ListItem.Property(Number),(,) - ]$INFO[ListItem.Property(Name)]</label>
                         </control>
                     </itemlayout>
-                    <focusedlayout height="84" width="8-col">
+                    <focusedlayout height="72" width="8-col">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/white.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
                             <animation type="focus" loop="false" reversible="false">
                                 <effect type="fade" time="500"/>
@@ -142,7 +141,7 @@
                 <control type="label">
                     <description>name label</description>
                     <posx>600</posx>
-                    <posy>2-row</posy>
+                    <posy>84</posy>
                     <width>8-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -150,13 +149,12 @@
                     <textcolor>textActive</textcolor>
                     <label>$LOCALIZE[31179]</label>
                 </control>
-                <control type="group">
+                <control type="grouplist">
                     <posx>8-col</posx>
-                    <posy>156</posy>
+                    <posy>168</posy>
+					<itemgap>0</itemgap>
                     <control type="radiobutton" id="7">
                         <description>Channel activated</description>
-                        <posx>0</posx>
-                        <posy>0</posy>
                         <width>564</width>
                         <label>19074</label>
                         <onleft>20</onleft>
@@ -165,8 +163,6 @@
                     </control>
                     <control type="edit" id="8">
                         <description>Channel name</description>
-                        <posx>0</posx>
-                        <posy>84</posy>
                         <width>564</width>
                         <font>buttonTitle</font>
                         <align>left</align>
@@ -182,8 +178,6 @@
                     </control>
                     <control type="button" id="9">
                         <description>Channel logo Button</description>
-                        <posx>0</posx>
-                        <posy>168</posy>
                         <width>564</width>
                         <label>19202</label>
                         <onleft>20</onleft>
@@ -191,18 +185,8 @@
                         <onup>8</onup>
                         <ondown>12</ondown>
                     </control>
-                    <control type="image" id="10">
-                        <posx>7-col</posx>
-                        <posy>180</posy>
-                        <width>48</width>
-                        <height>48</height>
-                        <aspectratio scalediffuse="false">scale</aspectratio>
-                        <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Property(Icon)]</texture>
-                    </control>
                     <control type="radiobutton" id="12">
                         <description>EPG activated</description>
-                        <posx>0</posx>
-                        <posy>252</posy>
                         <width>564</width>
                         <label>19206</label>
                         <onleft>20</onleft>
@@ -212,8 +196,6 @@
                     </control>
                     <control type="spincontrolex" id="13">
                         <description>EPG source</description>
-                        <posx>0</posx>
-                        <posy>336</posy>
                         <width>564</width>
                         <label>19200</label>
                         <onleft>20</onleft>
@@ -223,8 +205,6 @@
                     </control>
                     <control type="radiobutton" id="14">
                         <description>Parental locked</description>
-                        <posx>0</posx>
-                        <posy>420</posy>
                         <width>564</width>
                         <label>19267</label>
                         <onleft>20</onleft>
@@ -234,8 +214,6 @@
                     </control>
                     <control type="button" id="30">
                         <description>Group Manager Button</description>
-                        <posx>0</posx>
-                        <posy>504</posy>
                         <width>564</width>
                         <label>19205</label>
                         <onleft>20</onleft>
@@ -245,8 +223,6 @@
                     </control>
                     <control type="button" id="31">
                         <description>Edit channel Button</description>
-                        <posx>0</posx>
-                        <posy>588</posy>
                         <width>420</width>
                         <label>19203</label>
                         <onleft>20</onleft>
@@ -258,7 +234,7 @@
                 <!--OK / Cancel / apply-->                 
                 <control type="panel" id="9000">
                     <posx>17-col</posx>
-                    <posy>156</posy>
+                    <posy>84</posy>
                     <width>5-col</width>
                     <height>10-row</height>
                     <itemgap>0</itemgap>
diff --git a/1080i/DialogPVRGroupManager.xml b/1080i/DialogPVRGroupManager.xml
index 6341f04..67b9960 100644
--- a/1080i/DialogPVRGroupManager.xml
+++ b/1080i/DialogPVRGroupManager.xml
@@ -11,6 +11,15 @@
             <include>modalDialogInOutVertical</include>
             <!--content provider title / info-->
             <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1464</width>
+                <height>24-row</height>
+                <texture>colors/black.png</texture>
+                <colordiffuse>overlay</colordiffuse>
+                <aspectratio>stretch</aspectratio>
+            </control>
+			<control type="image">
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>20-col</width>
@@ -18,31 +27,13 @@
                 <texture>colors/white.png</texture>
                 <colordiffuse>highlight</colordiffuse>
                 <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>20-col</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
-            <control type="image">
-                <posx>4-col</posx>
-                <posy>2-row</posy>
-                <width>12-col</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
             </control>
 			<control type="image">
                 <posx>0</posx>
-                <posy>2-row</posy>
-                <width>20-col</width>
+                <posy>84</posy>
+                <width>1140</width>
                 <height>71</height>
-                <texture>colors/black.png</texture>
+                <texture>colors/offblack.png</texture>
                 <aspectratio>stretch</aspectratio>
                 <colordiffuse>textboxInactive</colordiffuse>
             </control>
@@ -61,7 +52,7 @@
             <control type="label">
                 <description>name label</description>
                 <posx>24</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>6-col</width>
                 <height>2-row</height>
                 <aligny>center</aligny>
@@ -71,11 +62,11 @@
             </control>
             <control type="group">
                 <posx>0</posx>
-                <posy>3-row</posy>
+                <posy>132</posy>
                 <control type="list" id="13">
                     <posx>0</posx>
                     <posy>1-row</posy>
-                    <width>4-col-textbox</width>
+                    <width>276</width>
                     <height>21-row</height>
                     <onright>12</onright>
                     <itemlayout height="2-row" width="4-col">
@@ -118,7 +109,7 @@
             <control type="group">
                 <description>Grouped Channels list</description>
                 <posx>4-col</posx>
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <control type="label" id="22">
                     <description>name label</description>
                     <posx>12</posx>
@@ -131,18 +122,18 @@
                 </control>
                 <control type="panel" id="12">
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>6-col-textbox</width>
-                    <height>19-row</height>
+                    <posy>84</posy>
+                    <width>420</width>
+                    <height>672</height>
                     <onleft>13</onleft>
                     <onright>11</onright>
                     <itemlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Icon]</texture>
                         </control>
                         <control type="label">
@@ -163,9 +154,9 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/white.png" border="0">$INFO[ListItem.Icon]</texture>
                             <animation type="focus" loop="false" reversible="false">
                                 <effect type="fade" time="500"/>
@@ -207,7 +198,7 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                 <control type="label" id="21">
                     <description>name label</description>
                     <posx>12</posx>
-                    <posy>0</posy>
+                    <posy>12</posy>
                     <width>6-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -216,18 +207,18 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                 </control>
                 <control type="panel" id="11">
                     <posx>0</posx>
-                    <posy>2-row</posy>
-                    <width>6-col-textbox</width>
-                    <height>19-row</height>
+                    <posy>96</posy>
+                    <width>420</width>
+                    <height>672</height>
                     <onleft>12</onleft>
                     <onright>9001</onright>
                     <itemlayout height="2-row" width="8-col">
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/offblack.png" border="0">$INFO[ListItem.Icon]</texture>
                         </control>
                         <control type="label">
@@ -248,9 +239,9 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
                         <control type="image">
                             <posx>0</posx>
                             <posy>0</posy>
-                            <width>2-row</width>
+                            <width>69</width>
                             <height>2-row</height>
-                            <aspectratio scalediffuse="false">stretch</aspectratio>
+                            <aspectratio>stretch</aspectratio>
                             <texture fallback="colors/white.png" border="0">$INFO[ListItem.Icon]</texture>
                             <animation type="focus" loop="false" reversible="false">
                                 <effect type="fade" time="500"/>
@@ -287,7 +278,7 @@ ListItem.ChannelNumberLabel,(,) - ]$INFO[ListItem.ChannelName]</label>
             <!--Dialog controls-->
             <control type="panel" id="9001">
                 <posx>16-col</posx>
-                <posy>4-row</posy>
+                <posy>84</posy>
                 <width>4-col</width>
                 <height>12-row</height>
                 <itemgap>3</itemgap>
diff --git a/1080i/DialogSubtitles.xml b/1080i/DialogSubtitles.xml
index 29f4314..9b6748d 100644
--- a/1080i/DialogSubtitles.xml
+++ b/1080i/DialogSubtitles.xml
@@ -7,10 +7,11 @@
             <posy>row-3-begin</posy>
             <!--animations-->
             <include>modalDialogInOutVertical</include>
-			<control type="image">
-                <posx>0</posx>
-                <posy>0</posy>
-                <width>20-col</width>
+            <!--dialog background-->
+            <control type="image">
+                <posx>-12</posx>
+                <posy>-12</posy>
+                <width>1464</width>
                 <height>23-row</height>
                 <texture>colors/black.png</texture>
                 <colordiffuse>aaFFFFFF</colordiffuse>
@@ -35,31 +36,12 @@
                 <label>$LOCALIZE[287] - $INFO[Player.Filename]</label>
                 <textcolor>textActive</textcolor>
             </control>
-            <!--dialog background-->
-            <control type="image">
-                <posx>0</posx>
-                <posy>2-row</posy>
-                <width>20-col</width>
-                <height>21-row</height>
-                <texture>colors/black.png</texture>
-                <colordiffuse>overlay</colordiffuse>
-                <aspectratio>stretch</aspectratio>
-            </control>
             <!-- ** Required ** Do not change <id>or<type>-->
             <control type="group">
                 <!--options-->
-                <control type="image">
-                    <posx>4-col</posx>
-                    <posy>2-row</posy>
-                    <width>16-col</width>
-                    <height>21-row</height>
-                    <texture>colors/black.png</texture>
-                    <colordiffuse>overlay</colordiffuse>
-                    <aspectratio>stretch</aspectratio>
-                </control>
                 <control type="label" id="140">
                     <posx>col-4-begin</posx>
-                    <posy>2-row</posy>
+                    <posy>84</posy>
                     <width>12-col</width>
                     <height>2-row</height>
                     <aligny>center</aligny>
@@ -70,7 +52,7 @@
                 <!--subtitle file selection-->
                 <control type="panel" id="120">
                     <posx>4-col</posx>
-                    <posy>4-row</posy>
+                    <posy>156</posy>
                     <width>16-col</width>
                     <height>19-row</height>
                     <onleft>150</onleft>
@@ -158,7 +140,7 @@
             </control>
             <!--manual search button-->
             <control type="button" id="160">
-                <posy>2-row</posy>
+                <posy>84</posy>
                 <width>4-col</width>
                 <label>31134</label>
                 <ondown>150</ondown>
@@ -169,13 +151,13 @@
             <control type="group">
                 <control type="list" id="150">
                     <posx>0</posx>
-                    <posy>4-row</posy>
+                    <posy>168</posy>
                     <width>4-col</width>
                     <height>11-row</height>
                     <onright>120</onright>
                     <onup>160</onup>
                     <scrolltime>200</scrolltime>
-                    <itemlayout width="4-col" height="2-row">
+                    <itemlayout width="4-col" height="84">
                         <control type="label">
                             <posx>24</posx>
                             <posy>0</posy>
@@ -203,7 +185,7 @@
                             <visible>ListItem.property(man)</visible>
                         </control>
                     </itemlayout>
-                    <focusedlayout width="4-col" height="2-row">
+                    <focusedlayout width="4-col" height="84">
                         <control type="image">
                             <visible>control.hasfocus(150)</visible>
                             <posx>0</posx>
diff --git a/1080i/FileBrowser.xml b/1080i/FileBrowser.xml
index 153a071..6a8d82b 100644
--- a/1080i/FileBrowser.xml
+++ b/1080i/FileBrowser.xml
@@ -151,10 +151,10 @@
             </control>
             <!--larger thumbnail-->
             <control type="image">
-                <posx>876</posx>
-                <posy>6-row</posy>
-                <width>4-col-gutter</width>
-                <height>4-col-gutter</height>
+                <posx>864</posx>
+                <posy>228</posy>
+                <width>4-col</width>
+                <height>4-col</height>
                 <aspectratio scalediffuse="false" align="left" aligny="center">keep</aspectratio>
                 <texture border="0">$INFO[Listitem.icon]</texture>
                 <fadetime>200</fadetime>
diff --git a/1080i/FileManager.xml b/1080i/FileManager.xml
index d5083e2..e24c140 100644
--- a/1080i/FileManager.xml
+++ b/1080i/FileManager.xml
@@ -18,7 +18,7 @@
                     <posx>-12</posx>
                     <posy>-12</posy>
                     <width>1320</width>
-                    <height>720</height>
+                    <height>732</height>
                     <texture>colors/black.png</texture>
                     <colordiffuse>overlay</colordiffuse>
                     <aspectratio>stretch</aspectratio>
@@ -45,11 +45,10 @@
                 </control>
 				<control type="image">
                     <posx>0</posx>
-                    <posy>2-row</posy>
+                    <posy>84</posy>
                     <width>18-col</width>
                     <height>71</height>
-                    <texture>colors/black.png</texture>
-					<colordiffuse>overlay</colordiffuse>
+                    <texture>colors/offblack.png</texture>
                     <aspectratio>stretch</aspectratio>
                 </control>
             </control>
@@ -60,7 +59,7 @@
                 <control type="label" id="101">
                     <description>Header Label</description>
                     <posx>24</posx>
-                    <posy>0</posy>
+                    <posy>12</posy>
                     <height>2-row</height>
                     <width>636</width>
                     <label></label>
@@ -82,9 +81,9 @@
                 <!--left file list-->
                 <control type="list" id="20">
                     <posx>0</posx>
-                    <posy>84</posy>
+                    <posy>96</posy>
                     <width>636</width>
-                    <height>15-row</height>
+                    <height>540</height>
                     <onright>21</onright>
 					<onleft>60</onleft>
 					<pagecontrol>60</pagecontrol>
@@ -144,7 +143,7 @@
                 <control type="label" id="102">
                     <description>Header Label</description>
                     <posx>24</posx>
-                    <posy>0</posy>
+                    <posy>12</posy>
                     <width>9-col-gutter</width>
                     <height>2-row</height>
                     <label></label>
@@ -153,9 +152,9 @@
                 </control>
                 <control type="list" id="21">
                     <posx>0</posx>
-                    <posy>84</posy>
+                    <posy>96</posy>
                     <width>9-col</width>
-                    <height>15-row</height>
+                    <height>540</height>
                     <onleft>20</onleft>
 					<onright>61</onright>
 					<pagecontrol>61</pagecontrol>