From 9545c64ae86e5ef4a455fe657b413c12a212dd9d Mon Sep 17 00:00:00 2001
From: theDeadMan <chrisbevan@users.noreply.github.com>
Date: Sat, 6 Oct 2018 19:24:09 +0100
Subject: [PATCH] tweaks

---
 1080i/View_AddonPosters.xml  |  4 ++--
 1080i/View_Albums.xml        |  8 ++++----
 1080i/View_ArtistAlbums.xml  |  2 +-
 1080i/View_Movies.xml        |  8 ++++----
 1080i/View_SpotifyAlbums.xml |  4 ++--
 1080i/View_TVShows.xml       |  8 ++++----
 shortcuts/overrides.xml      | 30 ++++++++++++++++++++++++++++++
 7 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/1080i/View_AddonPosters.xml b/1080i/View_AddonPosters.xml
index 1597258..0db8ff9 100644
--- a/1080i/View_AddonPosters.xml
+++ b/1080i/View_AddonPosters.xml
@@ -22,7 +22,7 @@
                 <onup>54</onup>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="cubic" easing="out">600</scrolltime>
-				<itemlayout width="252" height="426">
+				<itemlayout width="252" height="438">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
@@ -67,7 +67,7 @@
 						<label>$INFO[ListItem.year]</label>
 					</control>
 				</itemlayout>
-				<focusedlayout width="252" height="426">
+				<focusedlayout width="252" height="438">
 					<control type="group">
 						<include>focusThumb</include>
 						<control type="image">
diff --git a/1080i/View_Albums.xml b/1080i/View_Albums.xml
index e9dcec0..4defd0c 100644
--- a/1080i/View_Albums.xml
+++ b/1080i/View_Albums.xml
@@ -3,7 +3,7 @@
     <!--Album browser-->
     <include name="musicalbum">
 		<control type="group">
-			<visible>$EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue] + !Skin.HasSetting(disableRecentAlbums)</visible>
+			<visible>$EXP[isMusicAlbum] + !$EXP[isMusicArtistCatalogue]</visible>
 			<control type="image">
 				<visible>control.hasfocus(9998) | control.hasfocus(9123)</visible>
 	            <include>dimensionsFullscreen</include>
@@ -197,10 +197,10 @@
 	                <onright>60</onright>
 	                <ondown>50</ondown>
 	                <onup>9998</onup>
-	                <onback>9998</onback>
+	                <onback>9000</onback>
 	                <pagecontrol>60</pagecontrol>
 	                <scrolltime tween="cubic" easing="out">600</scrolltime>
-	                <itemlayout width="293" height="348">
+	                <itemlayout width="293" height="360">
 	                    <control type="image">
 	                        <posx>0</posx>
 	                        <posy>0</posy>
@@ -246,7 +246,7 @@
 	                        <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
 	                    </control>
 	                </itemlayout>
-	                <focusedlayout width="4-col" height="348">
+	                <focusedlayout width="4-col" height="360">
 	                    <control type="group">
 	                        <include>focusThumb</include>
 	                        <control type="image">
diff --git a/1080i/View_ArtistAlbums.xml b/1080i/View_ArtistAlbums.xml
index f64a311..a5e3f6b 100644
--- a/1080i/View_ArtistAlbums.xml
+++ b/1080i/View_ArtistAlbums.xml
@@ -45,7 +45,7 @@
 		                <height>2-row</height>
 		                <align></align>
 		                <font>menuTitle</font>
-		                <textcolor>menuUnselected</textcolor>
+		                <textcolor>textActive</textcolor>
 		                <label>$INFO[Container(52).ListItemAbsolute(0).genre]</label>
 		            </control>
                 </control>
diff --git a/1080i/View_Movies.xml b/1080i/View_Movies.xml
index 2bcef6e..16bb4c6 100644
--- a/1080i/View_Movies.xml
+++ b/1080i/View_Movies.xml
@@ -2,7 +2,7 @@
 <includes>
 	<include name="movies">
 		<control type="group">
-			<visible>$EXP[isMovie] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentMovies)</visible>
+			<visible>$EXP[isMovie] + !string.contains(container.folderpath,playlists)</visible>
 			<control type="image">
 				<visible>control.hasfocus(9103) | control.hasfocus(9102)</visible>
 	            <include>dimensionsFullscreen</include>
@@ -237,10 +237,10 @@
 					<onright>60</onright>
 					<ondown>50</ondown>
 					<onup>9103</onup>
-					<onback>9103</onback>
+					<onback>9000</onback>
 					<pagecontrol>60</pagecontrol>
 					<scrolltime tween="cubic" easing="out">600</scrolltime>
-					<itemlayout width="252" height="426">
+					<itemlayout width="252" height="438">
 						<control type="image">
 							<posx>0</posx>
 							<posy>0</posy>
@@ -319,7 +319,7 @@
 							</control>
 						</control>
 					</itemlayout>
-					<focusedlayout width="252" height="426">
+					<focusedlayout width="252" height="438">
 						<control type="group">
 							<include>focusThumb</include>
 							<control type="image">
diff --git a/1080i/View_SpotifyAlbums.xml b/1080i/View_SpotifyAlbums.xml
index 208da38..6615cc6 100644
--- a/1080i/View_SpotifyAlbums.xml
+++ b/1080i/View_SpotifyAlbums.xml
@@ -16,7 +16,7 @@
                 <onup>9998</onup>
                 <pagecontrol>60</pagecontrol>
                 <scrolltime tween="cubic" easing="out">600</scrolltime>
-                <itemlayout width="293" height="348">
+                <itemlayout width="293" height="360">
                     <control type="image">
                         <posx>0</posx>
                         <posy>0</posy>
@@ -62,7 +62,7 @@
                         <label>[B]$INFO[ListItem.Title][/B][CR]$INFO[ListItem.artist] - $INFO[listitem.year]</label>
                     </control>
                 </itemlayout>
-                <focusedlayout width="4-col" height="348">
+                <focusedlayout width="4-col" height="360">
                     <control type="group">
                         <include>focusThumb</include>
                         <control type="image">
diff --git a/1080i/View_TVShows.xml b/1080i/View_TVShows.xml
index 183082c..608937c 100644
--- a/1080i/View_TVShows.xml
+++ b/1080i/View_TVShows.xml
@@ -2,7 +2,7 @@
 <includes>
 	<include name="tvshows">
 		<control type="group">
-			<visible>$EXP[isTVShow] + !string.contains(container.folderpath,playlists) + !Skin.HasSetting(disableRecentTVShows)</visible>
+			<visible>$EXP[isTVShow] + !string.contains(container.folderpath,playlists)</visible>
 			<control type="image">
 				<visible>control.hasfocus(9203) | control.hasfocus(9202)</visible>
 	            <include>dimensionsFullscreen</include>
@@ -238,10 +238,10 @@
 				<onright>60</onright>
 				<ondown>52</ondown>
 				<onup>9203</onup>
-				<onback>9203</onback>
+				<onback>9000</onback>
 				<pagecontrol>60</pagecontrol>
 				<scrolltime tween="cubic" easing="out">600</scrolltime>
-				<itemlayout width="252" height="426">
+				<itemlayout width="252" height="438">
 					<control type="image">
 						<posx>0</posx>
 						<posy>0</posy>
@@ -332,7 +332,7 @@
 						</control>
 					</control>
 				</itemlayout>
-				<focusedlayout width="252" height="426">
+				<focusedlayout width="252" height="438">
 					<control type="group">
 						<include>focusThumb</include>
 						<control type="image">
diff --git a/shortcuts/overrides.xml b/shortcuts/overrides.xml
index fbea2b6..568bc4a 100644
--- a/shortcuts/overrides.xml
+++ b/shortcuts/overrides.xml
@@ -30,6 +30,16 @@
 		<action>Container.Update(videodb://movies/titles/)</action>
 		<action>control.setfocus(9103,0,absolute)</action>
 	</override>
+	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
+		<condition>!window.isactive(videos) + Skin.HasSetting(disableRecentMovies)</condition>
+		<action>::ACTION::</action>
+		<action>control.setfocus(9104,0,absolute)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://movies/titles/)" group="videosubmenu">
+		<condition>window.isactive(videos) + Skin.HasSetting(disableRecentMovies)</condition>
+		<action>Container.Update(videodb://movies/titles/)</action>
+		<action>control.setfocus(9104,0,absolute)</action>
+	</override>
 	
 	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="mainmenu">
 		<condition>!Skin.HasSetting(disableRecentTVShows)</condition>
@@ -50,6 +60,16 @@
 		<action>Container.Update(videodb://tvshows/titles/)</action>
 		<action>control.setfocus(9203,0,absolute)</action>
 	</override>
+	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
+		<condition>!window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)</condition>
+		<action>::ACTION::</action>
+		<action>control.setfocus(9204,0,absolute)</action>
+	</override>
+	<override action="ActivateWindow(Videos,videodb://tvshows/titles/)" group="videosubmenu">
+		<condition>window.isactive(videos) + Skin.HasSetting(disableRecentTVShows)</condition>
+		<action>Container.Update(videodb://tvshows/titles/)</action>
+		<action>control.setfocus(9204,0,absolute)</action>
+	</override>
 	
 	<override action="ActivateWindow(Music,musicdb://artists/)" group="musicsubmenu">
 		<condition>window.isactive(music)</condition>
@@ -79,6 +99,16 @@
 		<action>Container.Update(musicdb://albums/)</action>
 		<action>control.setfocus(9998,0,absolute)</action>
 	</override>
+	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
+		<condition>!window.isactive(music) + Skin.HasSetting(disableRecentAlbums)</condition>
+		<action>::ACTION::</action>
+		<action>control.setfocus(9124,0,absolute)</action>
+	</override>
+	<override action="ActivateWindow(Music,musicdb://albums/)" group="musicsubmenu">
+		<condition>window.isactive(music) + Skin.HasSetting(disableRecentAlbums)</condition>
+		<action>Container.Update(musicdb://albums/)</action>
+		<action>control.setfocus(9124,0,absolute)</action>
+	</override>
 	
 	<override action="ActivateWindow(Music,musicdb://genres/)" group="musicsubmenu">
 		<condition>window.isactive(music)</condition>