Fix sluggish home menus

braz96 · Mar 21, 2016 · d639dd8 · d639dd8
1 parent fb862ac
commit d639dd8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 39 deletions.
diff --git a/1080i/Home.xml b/1080i/Home.xml
@@ -6,8 +6,8 @@
 	<onunload condition="StringCompare(Skin.String(HomeLayout),3)">RunScript(script.skinshortcuts,type=hidesubmenu&amp;mainmenuID=9000)</onunload>
 	<onload>ClearProperty(MediaMenu,Home)</onload>
 	<controls>
-		<include>LiveCasesBackground</include>
-		<include>skinshortcuts-template-HomeFanart</include>
+		<include>CommonBackground</include>
+		<include>skinshortcuts-template-WidgetFanart</include>
 		<include condition="Skin.HasSetting(Enable.HomeTopbar) + !StringCompare(Skin.String(HomeLayout),2)">Topbar</include>
 		<include condition="!StringCompare(Skin.String(HomeLayout),2) + !StringCompare(Skin.String(HomeLayout),3)">HomeDefault</include>
 		<include condition="StringCompare(Skin.String(HomeLayout),2)">HomeTopMenu</include>

diff --git a/1080i/IncludesBackgroundBuilding.xml b/1080i/IncludesBackgroundBuilding.xml
@@ -2,7 +2,9 @@
 <includes>
 	<include name="CommonBackground">
 		<control type="group">
-			<include>GlobalFanart</include>
+			<include condition="Window.IsActive(home)">HomeFanart</include>
+ 			<include condition="!Window.IsActive(home)">GlobalFanart</include>
+ 			<include condition="Window.IsActive(home)">LiveCasesBackground</include>
 			<include condition="Window.IsActive(script-NextAired-TVGuide.xml) | Window.IsActive(script-NextAired-TVGuide2.xml)">TVShowNextAiredBackground</include>
 			<include condition="Window.IsActive(weather)">WeatherBackground</include>
 			<include condition="Window.IsActive(script-globalsearch-main.xml)">GlobalSearchBG</include>
@@ -24,7 +26,8 @@
 			</control>
 		</control>
 		<control type="image">
-			<visible>![Window.IsVisible(script-globalsearch-main.xml) | Control.IsVisible(59) | Control.IsVisible(511) | [Control.IsVisible(501) + !Window.IsActive(addoninformation)]]</visible>
+			<visible>!Window.IsActive(home) + !Window.IsVisible(script-globalsearch-main.xml) | [Window.IsActive(home) + Skin.HasSetting(Enable.HomeFanartOverlay) + !StringCompare(Skin.String(HomeLayout),3)]</visible>
+ 			<visible>![Control.IsVisible(59) | Control.IsVisible(511) | [Control.IsVisible(501) + !Window.IsActive(addoninformation)]]</visible>
 			<include>FullscreenDimensions</include>
 			<texture>background.png</texture>
 			<colordiffuse>$VAR[ColorBackgroundVar]</colordiffuse>
@@ -54,6 +57,29 @@
 			<imagepath fallback="special://skin/backgrounds/default_bg.jpg" background="true">$VAR[GlobalBackgroundVar]</imagepath>
 		</control>
 	</include>
+	<include name="HomeFanart">
+ 		<control type="multiimage">
+ 			<description>Normal Default Background Image</description>
+ 			<include>FullscreenDimensions</include>
+ 			<imagepath fallback="special://skin/backgrounds/default_bg.jpg" background="true">$VAR[HomeBackgroundVar]</imagepath>
+ 		</control>
+ 	</include>
+ 	<include name="WidgetFanartContents">
+ 		<control type="multiimage">
+ 			<description>Widget Background Image</description>
+ 			<visible>$PARAM[Visible]</visible>
+ 			<fadetime>300</fadetime>
+ 			<animation effect="fade" time="200" tween="cubic">Visible</animation>
+ 			<include>FullscreenDimensions</include>
+ 			<imagepath background="true">$PARAM[imagePath]</imagepath>
+ 		</control>
+ 		<control type="image">
+ 			<visible>$PARAM[Visible] + Skin.HasSetting(Enable.HomeFanartOverlay) + !StringCompare(Skin.String(HomeLayout),3)</visible>
+ 			<include>FullscreenDimensions</include>
+ 			<texture>background.png</texture>
+ 			<colordiffuse>$VAR[ColorBackgroundVar]</colordiffuse>
+ 		</control>
+ 	</include>
 	<include name="TVShowNextAiredBackground">
 		<control type="group">
 			<visible>!IsEmpty(Window(home).Property(TVGuide.BackgroundFanart))</visible>

diff --git a/shortcuts/template.xml b/shortcuts/template.xml
@@ -706,45 +706,15 @@
             </variable>
         </variables>
     </other>
-    <other include="HomeFanart">
+    <other include="WidgetFanart">
         <property name="id" tag="mainmenuid" />
         <property name="visible">Control.HasFocus(8011$SKINSHORTCUTS[id]) + !IsEmpty(Container(8011$SKINSHORTCUTS[id]).ListItem.Art(fanart))</property>
         <property name="imagepath">$INFO[Container(8011$SKINSHORTCUTS[id]).ListItem.Art(fanart)]</property>
         <controls>
-            <control type="group">
-                <visible>Player.HasAudio + !Skin.HasSetting(Disable.ShowBackgroundVis)</visible>
-                <control type="image">
-                    <include>FullscreenDimensions</include>
-                    <texture>black.png</texture>
-                </control>
-                <control type="visualisation">
-                    <include>FullscreenDimensions</include>
-                </control>
-            </control>
-            <control type="multiimage">
-                <description>Widget Background Image</description>
-                <fadetime>300</fadetime>
-                <animation effect="fade" time="200" tween="cubic">Visible</animation>
-                <animation effect="fade" start="100" end="40" time="0" condition="Visualisation.Enabled + !Skin.HasSetting(Disable.ShowBackgroundVis)">Conditional</animation>
-                <include>FullscreenDimensions</include>
-                <imagepath background="true">$VAR[HomeFanartPath]</imagepath>
-            </control>
-            <control type="videowindow">
-                <include>FullscreenDimensions</include>
-                <visible>Player.HasVideo + !Skin.HasSetting(Disable.ShowBackgroundVideo)</visible>
-            </control>
-            <control type="image">
-                <visible>Skin.HasSetting(Enable.HomeFanartOverlay) + !StringCompare(Skin.String(HomeLayout),3)</visible>
-                <include>FullscreenDimensions</include>
-                <texture>background.png</texture>
-                <colordiffuse>$VAR[ColorBackgroundVar]</colordiffuse>
-            </control>
+            <include name="WidgetFanartContents">
+                 <param name="Visible">$SKINSHORTCUTS[visible]</param>
+                 <param name="imagePath">$SKINSHORTCUTS[imagepath]</param>
+             </include>
         </controls>
-        <variables>
-            <variable name="HomeFanartPath">
-                <value condition="Control.HasFocus(8011$SKINSHORTCUTS[id]) + !IsEmpty(8011$SKINSHORTCUTS[id]).ListItem.Art(fanart))">$SKINSHORTCUTS[imagepath]</value>
-                <value>$VAR[HomeBackgroundVar]</value>
-            </variable>
-        </variables>
     </other>
 </template>