From f5634644aca083356cb2e97c84127a6ed24ce540 Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sat, 1 Sep 2018 15:25:36 +0100
Subject: [PATCH] Video addons fixes (test)

---
 1080i/Includes.xml          |  6 +++---
 1080i/MyGames.xml           |  2 +-
 1080i/MyMusicNav.xml        |  2 +-
 1080i/MyPVRChannels.xml     |  2 +-
 1080i/MyPVRRecordings.xml   |  2 +-
 1080i/MyPVRTimers.xml       |  2 +-
 1080i/MyPics.xml            |  2 +-
 1080i/MyPlaylist.xml        |  2 +-
 1080i/MyPrograms.xml        |  2 +-
 1080i/MyVideoNav.xml        |  4 ++--
 1080i/View_AddonPosters.xml | 16 ++++++++++++----
 1080i/View_Movies.xml       |  2 +-
 1080i/View_VideoFiles.xml   |  6 +++---
 13 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/1080i/Includes.xml b/1080i/Includes.xml
index d727425..1127b27 100644
--- a/1080i/Includes.xml
+++ b/1080i/Includes.xml
@@ -27,7 +27,7 @@
     <include file="Includes_mediaShowcase.xml"/>
 
     <!--view type conditions-->
-    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons)</expression>
+    <expression name="isVideoList">!String.Contains(container.folderpath,special://profile/playlists/video) + !String.Contains(container.folderpath,videodb://) + !String.Contains(container.folderpath,plugin://) | container.content(files) | String.IsEmpty(container.content) | container.content(playlists) | container.content(addons) | container.content(videos) | container.content(episodes)</expression>
     <expression name="isMovie">container.content(movies) + [String.Contains(container.folderpath,videodb://) | String.Contains(container.folderpath,special://profile/playlists/video)]</expression>
     <expression name="isAddonMovieOrTVshow">!String.Contains(container.folderpath,videodb://) + String.Contains(container.folderpath,plugin://) + [container.content(movies) | container.content(tvshows)]</expression>
 
@@ -182,7 +182,7 @@
 	        <!--subtitle-->
 	        <control type="label">
 	            <posx>0</posx>
-	            <posy>32</posy>
+	            <posy>28</posy>
 	            <width>12-col</width>
 				<height>2-row</height>
 	            <font>itemTitle</font>
@@ -202,7 +202,7 @@
 			<!--date-->
 	        <control type="label">
 	            <posx>24-col</posx>
-	            <posy>32</posy>
+	            <posy>28</posy>
 	            <width>12-col</width>
 				<height>2-row</height>
 				<align>right</align>
diff --git a/1080i/MyGames.xml b/1080i/MyGames.xml
index 03c70ef..e7632bb 100644
--- a/1080i/MyGames.xml
+++ b/1080i/MyGames.xml
@@ -20,7 +20,7 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyMusicNav.xml b/1080i/MyMusicNav.xml
index 4bd2732..dfc3d44 100644
--- a/1080i/MyMusicNav.xml
+++ b/1080i/MyMusicNav.xml
@@ -46,7 +46,7 @@
                 <control type="scrollbar" id="60">
                     <posx>54r</posx>
                     <posy>row-8-begin</posy>
-                    <height>20-row</height>
+                    <height>17-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/MyPVRChannels.xml b/1080i/MyPVRChannels.xml
index e1c2296..631ca83 100644
--- a/1080i/MyPVRChannels.xml
+++ b/1080i/MyPVRChannels.xml
@@ -29,7 +29,7 @@
                 <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 1a6915e..44daea4 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -151,7 +151,7 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyPVRTimers.xml b/1080i/MyPVRTimers.xml
index 591d7fe..2d163f6 100644
--- a/1080i/MyPVRTimers.xml
+++ b/1080i/MyPVRTimers.xml
@@ -184,7 +184,7 @@
                 <visible>Control.IsVisible(60) + !control.isvisible(10)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(9400).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyPics.xml b/1080i/MyPics.xml
index 5b8b079..2587586 100644
--- a/1080i/MyPics.xml
+++ b/1080i/MyPics.xml
@@ -21,7 +21,7 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyPlaylist.xml b/1080i/MyPlaylist.xml
index 94b12ed..8bc8605 100644
--- a/1080i/MyPlaylist.xml
+++ b/1080i/MyPlaylist.xml
@@ -36,7 +36,7 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyPrograms.xml b/1080i/MyPrograms.xml
index 0a61873..6f02edb 100644
--- a/1080i/MyPrograms.xml
+++ b/1080i/MyPrograms.xml
@@ -122,7 +122,7 @@
                 <visible>Control.IsVisible(60)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
-                    <posx>52r</posx>
+                    <posx>54r</posx>
                     <posy>row-6-begin</posy>
                     <height>20-row</height>
                     <onleft>9999</onleft>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 328858c..3f889a5 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -4,7 +4,7 @@
     <onload condition="Skin.hassetting(stopVideoOnMenu) + !Player.HasAudio">PlayerControl(stop)</onload>
     <onload>Skin.SetString(recentitems,video)</onload>
     <include>fadeInOut</include>
-	<views>50,51,52,53,54,58,59</views>
+	<views>50,51,52,53,54,55,58,59</views>
     <controls>
         <include>globalBackground</include>
         <!--page container group-->
@@ -32,7 +32,7 @@
                 <control type="scrollbar" id="60">
                     <posx>54r</posx>
                     <posy>row-8-begin</posy>
-                    <height>20-row</height>
+                    <height>17-row</height>
                     <onleft>9999</onleft>
                     <onback>9999</onback>
                 </control>
diff --git a/1080i/View_AddonPosters.xml b/1080i/View_AddonPosters.xml
index 98fcb8e..39fa3cb 100644
--- a/1080i/View_AddonPosters.xml
+++ b/1080i/View_AddonPosters.xml
@@ -2,6 +2,14 @@
 <includes>
     <include name="addonposters">
         <control type="group">
+            <visible>$EXP[isAddonMovieOrTVshow]</visible>
+			<control type="image">
+	            <include>dimensionsFullscreen</include>
+	            <texture fallback="colors/black.png">$INFO[listitem.art(fanart)]</texture>
+	            <colordiffuse>FF555555</colordiffuse>
+	            <aspectratio>scale</aspectratio>
+				<fadetime>250</fadetime>
+	        </control>
             <control type="panel" id="54">
                 <visible>$EXP[isAddonMovieOrTVshow]</visible>
                 <posx>90</posx>
@@ -10,8 +18,8 @@
 				<height>22-row</height>
 				<onleft>9000</onleft>
 				<onright>60</onright>
-                <ondown>50</ondown>
-                <onup>50</onup>
+                <ondown>54</ondown>
+                <onup>54</onup>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="cubic" easing="out">600</scrolltime>
 				<itemlayout width="252" height="426">
@@ -34,7 +42,7 @@
 						<aspectratio>stretch</aspectratio>
 						<texture>$INFO[ListItem.Art(poster)]</texture>
 						<bordersize>6</bordersize>
-						<colordiffuse>77ffffff</colordiffuse>
+						<colordiffuse>BBffffff</colordiffuse>
 					</control>
 					<control type="textbox">
 						<visible>String.IsEmpty(listitem.title)</visible>
@@ -51,7 +59,7 @@
 						<visible>!controlgroup(9000).hasfocus</visible>
 						<posx>12</posx>
 						<posy>338</posy>
-						<width>204</width>
+						<width>192</width>
 						<height>1-row</height>
 						<aligny>center</aligny>
 						<font>thumbTitle</font>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 9f954c2..640a85d 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -87,7 +87,7 @@
 	                <width>1740</width>
 	                <height>11-row</height>
 					<onup>9102</onup>
-	                <ondown>50</ondown>
+	                <ondown>51</ondown>
 	                <onleft>9000</onleft>
 	                <onback>9000</onback>
 	                <orientation>horizontal</orientation>
diff --git a/1080i/View_VideoFiles.xml b/1080i/View_VideoFiles.xml
index bd1e97b..2e50133 100644
--- a/1080i/View_VideoFiles.xml
+++ b/1080i/View_VideoFiles.xml
@@ -13,7 +13,7 @@
                 <include>kenBurnsey</include>
             </control>
         </control>
-        <control type="panel" id="50">
+        <control type="panel" id="55">
             <visible>$EXP[isVideoList]</visible>
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
@@ -21,8 +21,8 @@
             <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
-            <ondown>50</ondown>
-            <onup>50</onup>
+            <ondown>55</ondown>
+            <onup>55</onup>
             <pagecontrol>60</pagecontrol>
             <itemlayout width="24-col" height="2-row">
                 <control type="image">