window transition refinement

realcopacetic · Nov 13, 2023 · 9635097 · 9635097
1 parent 8a3683b
commit 9635097
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 18 deletions.
diff --git a/16x9/Animations.xml b/16x9/Animations.xml
@@ -110,12 +110,12 @@
 		<animation effect="fade" start="100" end="0" delay="360" time="30" reversible="false" tween="sine" easing="inout" condition="Control.HasFocus(3100)">Conditional</animation>
 	</include>
 	<include name="Settings_WindowOpenClose_Fade_Delayed_Animation">
-		<animation effect="fade" start="0" end="100" time="360" delay="360" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Previous]">WindowOpen</animation>
-		<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Next]">WindowClose</animation>
+		<animation effect="fade" start="0" end="100" time="360" delay="360" tween="sine" easing="inout" reversible="true" condition="Window.Previous(settings)">WindowOpen</animation>
+		<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]">WindowClose</animation>
 	</include>
 	<include name="Settings_WindowOpenClose_Fade_Delayed_Long_Animation">
-		<animation effect="fade" start="0" end="100" time="360" delay="1260" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Previous]">WindowOpen</animation>
-		<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!$EXP[Settings_Next]">WindowClose</animation>
+		<animation effect="fade" start="0" end="100" time="360" delay="1260" tween="sine" easing="inout" reversible="true" condition="Window.Previous(settings)">WindowOpen</animation>
+		<animation effect="fade" start="100" end="0" time="180" tween="sine" easing="inout" reversible="true" condition="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]">WindowClose</animation>
 	</include>
 	<include name="Trailer_Autoplay_Fade_Animation">
 		<animation effect="fade" start="100" end="0" time="360" delay="1080" tween="sine" easing="inout" reversible="false" condition="$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>

diff --git a/16x9/Components.xml b/16x9/Components.xml
@@ -119,7 +119,7 @@
 		<param name="fadeout_animation_condition" default="true" />
 		<definition>
 			<control type="multiimage">
-				<include content="WindowOpenClose_Fade_Delayed_Animation" condition="!$EXP[Window_IsSettings]">
+				<include content="WindowOpenClose_Fade_Delayed_Animation">
 					<param name="fadein_condition" value="$PARAM[fadein_animation_condition]" />
 					<param name="fadeout_condition" value="$PARAM[fadeout_animation_condition]" />
 				</include>
@@ -138,7 +138,7 @@
 
 	<include name="Background_Multiart_Home">
 		<include content="Background_Multiart">
-			<param name="fadein_animation_condition" value="!Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="![Window.Previous(addonbrowser) + !String.IsEqual(Window(home).Property(Container_Addons_NonRepo),true)] + !$EXP[Settings_Previous]" />
 			<param name="fadeout_animation_condition" value="!Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 			<param name="colordiffuse" value="$VAR[Home_Artwork_Diffuse]" />
 			<param name="texture_path" value="$VAR[Background_Home_Texture]" />

diff --git a/16x9/Components_Viewtypes.xml b/16x9/Components_Viewtypes.xml
@@ -61,6 +61,9 @@
 				<!-- Trailer Autoplay -->
 				<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true) + Player.HasVideo">PlayerControl(Stop)</onunfocus>
 				<onunfocus condition="String.IsEqual(Window(home).Property(Trailer_Autoplay),true)">ClearProperty(Trailer_Autoplay,home)</onunfocus>
+				<!-- Settings transition from addonbrowser -->
+				<onfocus condition="Window.Is(addonbrowser) + $EXP[Container_Addons_NonRepo]">SetProperty(Container_Addons_NonRepo,true,home)</onfocus>
+				<onfocus condition="Window.Is(addonbrowser) + !$EXP[Container_Addons_NonRepo]">ClearProperty(Container_Addons_NonRepo,home)</onfocus>
 			</control>
 		</definition>
 	</include>

diff --git a/16x9/Content_Settings.xml b/16x9/Content_Settings.xml
@@ -211,6 +211,7 @@
 			<visible>!ControlGroup(9).HasFocus(11) + !ControlGroup(9).HasFocus(12) + !ControlGroup(9).HasFocus(13) + !ControlGroup(9).HasFocus(14) + !ControlGroup(9).HasFocus(15) + !ControlGroup(9).HasFocus(16)</visible>
 			<include content="skinsettings_Default_Label" />
 			<label>$LOCALIZE[24997]</label>
+			<animation effect="slide" start="0" end="0,-1" condition="true">Conditional</animation>
 		</control>
 		<control type="image" id="1001">
 			<description>Themes screenshot</description>
@@ -553,13 +554,13 @@
 			<selected>Skin.HasSetting(shutdownmenu_Shortcut)</selected>
 			<include content="skinsettings_Default_Label" />
 		</control> 
-		<control type="label" id="1340">
+		<control type="label" id="1341">
 			<description>List</description>
 			<visible>ControlGroup(9).HasFocus(13)</visible>
 			<label>$LOCALIZE[31000]</label>
 			<include content="skinsettings_Default_Label" />
 		</control>
-		<control type="radiobutton" id="1341">
+		<control type="radiobutton" id="1342">
 			<description>Add movement</description>
 			<label>$LOCALIZE[31441]</label>
 			<onclick>Skin.ToggleSetting(List_Ken_Burns_Effect)</onclick>

diff --git a/16x9/FileManager.xml b/16x9/FileManager.xml
@@ -8,7 +8,7 @@
 	<controls>
 		<include content="Light_Theme_Background" condition="!$EXP[Library_Has_Content]" />
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
-			<param name="fadein_animation_condition" value="!Window.Previous(home) + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="![Window.Previous(home) + String.IsEmpty(window(home).property(Home_Widget))] + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
 			<param name="fadeout_animation_condition" value="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 		</include>
 		<include content="Default_Dialog_Panel_And_Lists_Layout">

diff --git a/16x9/Home.xml b/16x9/Home.xml
@@ -31,7 +31,7 @@
 			<include content="Trailer_Autoplay_Fade_Delayed_Animation" condition="Skin.HasSetting(Trailer_Autoplay)" />
 		</include>
 		<control type="group">
-			<visible>[Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus] | Window.Next(addonbrowser) | $EXP[Settings_Next]] + !$EXP[Infoscreen_IsVisible]</visible>
+			<visible>[Control.HasFocus(3000) | Control.HasFocus(4300) | $EXP[Music_Player_HasFocus]] + !$EXP[Infoscreen_IsVisible]</visible>
 			<include content="VisibleHidden_Fade_Animation" />
 			<include content="Background_Home" condition="$EXP[Library_Has_Content]" />
 			<include content="Home_Clearlogo" condition="Skin.HasSetting(Home_Screensaver_Enabled) + $EXP[Library_Has_Content]" />

diff --git a/16x9/Settings.xml b/16x9/Settings.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
 	<!-- settings -->
+	<onload condition="[Window.Previous(home) + String.IsEmpty(Window(home).Property(Home_Widget))] | [Window.Previous(addonbrowser) + String.IsEmpty(Window(home).Property(Container_Addons_NonRepo))]">SetProperty(Settings_Transition_Override,true,home)</onload>
+	<onunload>ClearProperty(Container_Addons_NonRepo,home)</onunload>
+	<onunload>ClearProperty(Home_Widget,home)</onunload>
 	<defaultcontrol always="true">4010</defaultcontrol>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
 	<controls>
 		<include content="Focus_Setter">
 			<param name="target_id" value="ReplaceWindowAndFocus(skinsettings,4010)" />
 		</include>
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
+			<param name="visible" value="[Window.Previous(home) + String.IsEmpty(Window(home).Property(Home_Widget))] | [Window.Previous(addonbrowser) + String.IsEmpty(Window(home).Property(Container_Addons_NonRepo))]" />
 			<param name="fadein_animation_condition" value="false" />
 			<param name="fadeout_animation_condition" value="false" />
 		</include>

diff --git a/16x9/SettingsCategory.xml b/16x9/SettingsCategory.xml
@@ -10,7 +10,7 @@
 		</include>
 		<include content="Light_Theme_Background" condition="!$EXP[Library_Has_Content]" />
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
-			<param name="fadein_animation_condition" value="!Window.Previous(home) + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="![Window.Previous(home) + String.IsEmpty(window(home).property(Home_Widget))] + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
 			<param name="fadeout_animation_condition" value="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 		</include>
 		<include content="Default_Settings_Panel_Layout">

diff --git a/16x9/SettingsProfile.xml b/16x9/SettingsProfile.xml
@@ -6,7 +6,7 @@
 	<controls>
 		<include content="Light_Theme_Background" condition="!$EXP[Library_Has_Content]" />
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
-			<param name="fadein_animation_condition" value="!Window.Previous(home) + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="![Window.Previous(home) + String.IsEmpty(window(home).property(Home_Widget))] + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
 			<param name="fadeout_animation_condition" value="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 		</include>
 		<include content="Default_Settings_Panel_Layout">

diff --git a/16x9/SettingsSystemInfo.xml b/16x9/SettingsSystemInfo.xml
@@ -6,7 +6,7 @@
 	<controls>
 		<include content="Light_Theme_Background" condition="!$EXP[Library_Has_Content]" />
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
-			<param name="fadein_animation_condition" value="!Window.Previous(home) + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="![Window.Previous(home) + String.IsEmpty(window(home).property(Home_Widget))] + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
 			<param name="fadeout_animation_condition" value="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 		</include>
 		<include content="Default_Settings_Panel_Layout">

diff --git a/16x9/SkinSettings.xml b/16x9/SkinSettings.xml
@@ -4,13 +4,14 @@
 	<onunload condition="System.AddonIsEnabled(script.skinshortcuts)">RunScript(script.skinshortcuts,type=buildxml&amp;mainmenuID=3000&amp;group=mainmenu|shutdownmenu)</onunload>
 	<onunload condition="System.AddonIsEnabled(script.copacetic.helper) + !Skin.String(User_Defined_Accent_Color,copacetic_accent_color)">RunScript(script.copacetic.helper,action=hex_contrast_check,hex=$INFO[Skin.String(User_Defined_Accent_Color)])</onunload>
 	<onunload condition="!ControlGroup(9).HasFocus(10)">SetFocus(10)</onunload>
+	<onunload>ClearProperty(Settings_Transition_Override,home)</onunload>
 	<defaultcontrol always="true">3001</defaultcontrol>
 	<backgroundcolor>$VAR[Dark_Color]</backgroundcolor>
 	<controls>
 		<include content="Widget_Reset_Button" condition="Skin.HasSetting(Widgets_Enabled)" />
 		<include content="Light_Theme_Background" condition="!$EXP[Library_Has_Content]" />
 		<include content="Background_Global" condition="$EXP[Library_Has_Content]">
-			<param name="fadein_animation_condition" value="!Window.Previous(home) + !Window.Previous(addonbrowser) + !$EXP[Settings_Previous]" />
+			<param name="fadein_animation_condition" value="Window.Previous(settings) + !String.IsEqual(Window(home).Property(Settings_Transition_Override),true)" />
 			<param name="fadeout_animation_condition" value="!Window.Next(home) + !Window.Next(addonbrowser) + !$EXP[Settings_Next]" />
 		</include>
 		<include content="Default_Settings_Panel_Layout">

diff --git a/16x9/Templates_MyWindows.xml b/16x9/Templates_MyWindows.xml
@@ -194,15 +194,15 @@
 	</include>
 
 	<include name="addonbrowser_Views">
-		<param name="visible" default="!$EXP[Infoscreen_IsVisible] + !Window.IsVisible(addonsettings)" />
+		<param name="visible" default="!$EXP[Infoscreen_IsVisible]" />
 		<definition>
 			<!-- Background -->
 			<include content="Light_Theme_Background">
 				<param name="visible" value="[$EXP[Container_Addons_Repo] + $EXP[Infoscreen_IsVisible]] | [$EXP[Container_Addons_NonRepo] + !$EXP[ShowcaseView_Display_IsBackground]]" />
 			</include>
 			<include content="Background_Global" condition="$EXP[Library_Has_Content]">
 				<param name="visible" value="$PARAM[visible] + !$EXP[Container_Addons_NonRepo]" />
-				<param name="fadein_animation_condition" value="!Window.Previous(home) + !$EXP[Settings_Previous]" />
+				<param name="fadein_animation_condition" value="![Window.Previous(home) + String.IsEmpty(window(home).property(Home_Widget))] + !$EXP[Settings_Previous]" />
 				<param name="fadeout_animation_condition" value="!Window.Next(home) + !$EXP[Settings_Next]" />
 				<param name="local_list_content" value="true" />
 				<param name="content_source" value="Media" />

diff --git a/16x9/Templates_Panels.xml b/16x9/Templates_Panels.xml
@@ -55,6 +55,7 @@
 				<param name="visible" value="$PARAM[visible]" />
 				<param name="top" value="$PARAM[panel_edge_top]" />
 				<param name="bottom" value="$PARAM[panel_edge_bottom]" />
+				<include content="Settings_WindowOpenClose_Fade_Delayed_Animation" />
 				<include content="Visible_Fade_Animation" />
 			</include>
 			<control type="group">

diff --git a/16x9/Variables_Labels_Windows.xml b/16x9/Variables_Labels_Windows.xml
@@ -183,7 +183,7 @@
 		<value condition="Control.HasFocus(1105) + $EXP[Library_Has_Content]">$LOCALIZE[31533]</value>
 		<value condition="Control.HasFocus(1105) + !$EXP[Library_Has_Content]">$LOCALIZE[31534]</value>
 		<value condition="Control.HasFocus(11060) | Control.HasFocus(11061)">$LOCALIZE[31535]</value>
-		<value condition="Control.HasFocus(1109) | Control.HasFocus(1020) | Control.HasFocus(1304) | Control.HasFocus(1341)">$LOCALIZE[31541]</value>
+		<value condition="Control.HasFocus(1109) | Control.HasFocus(1020) | Control.HasFocus(1304) | Control.HasFocus(1342)">$LOCALIZE[31541]</value>
 		<value condition="Control.HasFocus(1110)">$LOCALIZE[31542]</value>
 		<value condition="Control.HasFocus(1111)">$LOCALIZE[31543]</value>
 		<!-- Views -->

diff --git a/addon.xml b/addon.xml
@@ -6,7 +6,7 @@
 		<import addon="resource.fonts.copacetic" version="1.0.2" />
 		<import addon="script.skinshortcuts" version="1.1.5" />
 	</requires>
-	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.8" debugging="true">
+	<extension point="xbmc.gui.skin" defaultthemename="Textures.xbt" effectslowdown="0.8" debugging="false">
 		<res width="1920" height="1080" aspect="16:9" default="true" folder="16x9" />
 	</extension>
 	<extension point="xbmc.addon.metadata">