From 1bf37121338f72efd1f3ecd2aaa524c32d261771 Mon Sep 17 00:00:00 2001
From: Chris Bevan <bevan.chris@gmail.com>
Date: Sun, 31 May 2015 11:45:19 +0100
Subject: [PATCH] various

---
 1080i/MyPVRGuide.xml          | 4 ++--
 1080i/MyPVRRecordings.xml     | 4 ++--
 1080i/MyVideoNav.xml          | 8 ++++++++
 1080i/View_Albums.xml         | 2 +-
 1080i/View_Artists.xml        | 4 ++--
 1080i/View_Episodes.xml       | 4 ++--
 1080i/View_Files.xml          | 2 +-
 1080i/View_LiveTVChannels.xml | 2 +-
 1080i/View_MusicFiles.xml     | 2 +-
 9 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/1080i/MyPVRGuide.xml b/1080i/MyPVRGuide.xml
index caa0ad8..7715614 100644
--- a/1080i/MyPVRGuide.xml
+++ b/1080i/MyPVRGuide.xml
@@ -29,9 +29,9 @@
                 <control type="epggrid" id="10">
                     <description>EPG Grid</description>
                     <posx>col-1-begin</posx>
-                    <posy>row-4-begin</posy>
+                    <posy>row-5-begin</posy>
                     <width>24-col</width>
-                    <height>24-row</height>
+                    <height>23-row</height>
                     <pagecontrol>10</pagecontrol>
                     <timeblocks>30</timeblocks>
                     <progresstexture border="0,33,18,14">UIControls/PVR-EpgProgressIndicator.png</progresstexture>
diff --git a/1080i/MyPVRRecordings.xml b/1080i/MyPVRRecordings.xml
index 18afd2b..7e4d6de 100644
--- a/1080i/MyPVRRecordings.xml
+++ b/1080i/MyPVRRecordings.xml
@@ -32,7 +32,7 @@
                     <posx>0</posx>
                     <posy>0</posy>
                     <width>24-col</width>
-                    <height>22-row</height>
+                    <height>21-row</height>
                     <onleft>9000</onleft>
                     <onright>60</onright>
                     <pagecontrol>60</pagecontrol>
@@ -173,7 +173,7 @@
                 <control type="scrollbar" id="60">
                     <posx>84r</posx>
                     <posy>row-5-begin</posy>
-                    <height>789</height>
+                    <height>21-row</height>
                     <onleft>9999</onleft>
                 </control>
             </control>
diff --git a/1080i/MyVideoNav.xml b/1080i/MyVideoNav.xml
index 262db14..3dfa2fd 100644
--- a/1080i/MyVideoNav.xml
+++ b/1080i/MyVideoNav.xml
@@ -47,11 +47,19 @@
                 <visible>Control.IsVisible(60) + SubString(skin.string(showRecentVideoItems),false)</visible>
                 <animation effect="fade" start="100" end="0" time="100" condition="!controlgroup(8000).hasfocus">conditional</animation>
                 <control type="scrollbar" id="60">
+                    <visible>!control.isvisible(52)</visible>
                     <posx>84r</posx>
                     <posy>row-5-begin</posy>
                     <height>789</height>
                     <onleft>9999</onleft>
                 </control>
+                <control type="scrollbar" id="60">
+                    <visible>control.isvisible(52)</visible>
+                    <posx>84r</posx>
+                    <posy>row-8-begin</posy>
+                    <height>19-row</height>
+                    <onleft>9999</onleft>
+                </control>
             </control>
 
             <!--Folder titles-->
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index 85b848e..b8ace35 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -25,7 +25,7 @@
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <width>24-col</width>
-            <height>24-row</height>
+            <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>55</ondown>
diff --git a/1080i/View_Artists.xml b/1080i/View_Artists.xml
index 59288bd..c41cadc 100644
--- a/1080i/View_Artists.xml
+++ b/1080i/View_Artists.xml
@@ -7,7 +7,7 @@
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <width>24-col</width>
-            <height>22-row</height>
+            <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>53</ondown>
@@ -20,7 +20,7 @@
                     <width>66</width>
                     <height>66</height>
                     <aspectratio scalediffuse="false">stretch</aspectratio>
-                    <texture fallback="colors/offblack.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
+                    <texture fallback="colors/black.png" diffuse="masks/circle.png" border="0">$INFO[Listitem.thumb]</texture>
                 </control>
                 <control type="label">
                     <posx>1-col-indent</posx>
diff --git a/1080i/View_Episodes.xml b/1080i/View_Episodes.xml
index 707c8e1..5a96990 100644
--- a/1080i/View_Episodes.xml
+++ b/1080i/View_Episodes.xml
@@ -65,7 +65,7 @@
                 <posx>col-13-begin</posx>
                 <posy>row-8-begin</posy>
                 <width>12-col</width>
-                <height>20-row</height>
+                <height>19-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <pagecontrol>60</pagecontrol>
@@ -197,7 +197,7 @@
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>24-col</width>
-                <height>22-row</height>
+                <height>23-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>52</ondown>
diff --git a/1080i/View_Files.xml b/1080i/View_Files.xml
index a03082c..7914370 100644
--- a/1080i/View_Files.xml
+++ b/1080i/View_Files.xml
@@ -6,7 +6,7 @@
             <posx>col-1-begin</posx>
             <posy>row-5-begin</posy>
             <width>24-col</width>
-            <height>25-row</height>
+            <height>23-row</height>
             <onleft>9000</onleft>
             <onright>60</onright>
             <ondown>50</ondown>
diff --git a/1080i/View_LiveTVChannels.xml b/1080i/View_LiveTVChannels.xml
index 83fc779..3219e0e 100644
--- a/1080i/View_LiveTVChannels.xml
+++ b/1080i/View_LiveTVChannels.xml
@@ -6,7 +6,7 @@
                 <posx>col-1-begin</posx>
                 <posy>row-5-begin</posy>
                 <width>24-col</width>
-                <height>22-row</height>
+                <height>23-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <pagecontrol>60</pagecontrol>
diff --git a/1080i/View_MusicFiles.xml b/1080i/View_MusicFiles.xml
index 14ae571..086ce2b 100644
--- a/1080i/View_MusicFiles.xml
+++ b/1080i/View_MusicFiles.xml
@@ -10,7 +10,7 @@
                 <posx>0</posx>
                 <posy>0</posy>
                 <width>24-col</width>
-                <height>22-row</height>
+                <height>23-row</height>
                 <onleft>9000</onleft>
                 <onright>60</onright>
                 <ondown>51</ondown>