🧰 Nesting cleanup

jurialmunkey · Apr 18, 2024 · f82afff · f82afff
1 parent 4e9484c
commit f82afff
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 72 deletions.
diff --git a/1080i/Includes_MediaWall.xml b/1080i/Includes_MediaWall.xml
@@ -205,26 +205,29 @@
         <param name="item_w">view_poster_item_w</param>
         <param name="item_h">view_poster_item_h</param>
         <param name="selected">false</param>
+        <param name="conditionalfade_condition">false</param>
         <definition>
-            <include content="$PARAM[layout_include]">
-                <param name="icon">$VAR[$PARAM[icon_base_var]_C$PARAM[id]_$PARAM[mod]$PARAM[pos]]</param>
-                <param name="item_w">$PARAM[item_w]</param>
-                <param name="item_h">$PARAM[item_h]</param>
-                <param name="affix">_C$PARAM[id]_$PARAM[mod]$PARAM[pos]</param>
-                <param name="listitem">Container($PARAM[id]).ListItem($PARAM[mod]$PARAM[pos])</param>
-                <param name="selected">$PARAM[selected]</param>
-                <param name="id">$PARAM[id]</param>
-
-                <nested />
+            <control type="group">
+                <include content="$PARAM[layout_include]">
+                    <param name="icon">$VAR[$PARAM[icon_base_var]_C$PARAM[id]_$PARAM[mod]$PARAM[pos]]</param>
+                    <param name="item_w">$PARAM[item_w]</param>
+                    <param name="item_h">$PARAM[item_h]</param>
+                    <param name="affix">_C$PARAM[id]_$PARAM[mod]$PARAM[pos]</param>
+                    <param name="listitem">Container($PARAM[id]).ListItem($PARAM[mod]$PARAM[pos])</param>
+                    <param name="selected">$PARAM[selected]</param>
+                    <param name="id">$PARAM[id]</param>
+                </include>
 
                 <include content="Animation_ConditionalFade">
-                    <param name="condition">String.IsEmpty(Container($PARAM[id]).ListItemNoWrap($PARAM[mod]$PARAM[pos]).CurrentItem)</param>
+                    <param name="condition">String.IsEmpty(Container($PARAM[id]).ListItemNoWrap($PARAM[mod]$PARAM[pos]).CurrentItem) | [$PARAM[conditionalfade_condition]]</param>
                 </include>
 
                 <left>$PARAM[mod]$PARAM[prefix]_end_x_$PARAM[col]</left>
                 <top>$PARAM[prefix]_end_y_$PARAM[row]</top>
                 <visible>$PARAM[visible]</visible>
                 <visible>Control.IsVisible($PARAM[id])</visible>
+                <width>$PARAM[item_w]</width>
+                <height>$PARAM[item_h]</height>
 
                 <include content="$PARAM[visible_animation_include]">
                     <param name="col">$PARAM[col]</param>
@@ -245,8 +248,7 @@
                     <param name="visible">$PARAM[visible]</param>
                     <param name="prefix">$PARAM[prefix]</param>
                 </include>
-
-            </include>
+            </control>
         </definition>
     </include>
 
@@ -278,7 +280,7 @@
                 <param name="pos">$PARAM[p_0]</param>
                 <param name="row">$PARAM[row]</param>
                 <param name="col">0</param>
-                <animation effect="fade" start="100" end="0" condition="$PARAM[selected]">Conditional</animation>
+                <param name="conditionalfade_condition">$PARAM[selected]</param>
             </include>
             <include content="MediaWall_Poster" condition="$PARAM[enable_0]">
                 <param name="layout_include">$PARAM[layout_include]</param>
@@ -294,7 +296,7 @@
                 <param name="row">$PARAM[row]</param>
                 <param name="col">0</param>
                 <param name="selected">true</param>
-                <animation effect="fade" start="100" end="0" condition="![$PARAM[selected]]">Conditional</animation>
+                <param name="conditionalfade_condition">![$PARAM[selected]]</param>
             </include>
 
             <!-- Positive -->

diff --git a/1080i/Includes_Transitions.xml b/1080i/Includes_Transitions.xml
@@ -149,32 +149,51 @@
         <param name="selected">false</param>
         <param name="positional_listitem">ListItem</param>
         <param name="conditional_listitem">ListItemNoWrap</param>
+        <param name="use_alternate">false</param>
         <definition>
-            <include content="$PARAM[content]">
-                <param name="icon">$VAR[$PARAM[icon_base_var]$PARAM[affix]_$PARAM[pos]]</param>
-                <param name="item_w">$PARAM[item_w]</param>
-                <param name="item_h">$PARAM[item_h]</param>
-                <param name="affix">$PARAM[affix]_$PARAM[pos]</param>
-                <param name="listitem">Container($PARAM[id]).$PARAM[positional_listitem]($PARAM[pos])</param>
-                <param name="id">$PARAM[id]</param>
-                <param name="selected">$PARAM[selected]</param>
-                <param name="detailed">$PARAM[detailed]</param>
-                <param name="misc">$PARAM[misc]</param>
-                <param name="variation">$PARAM[variation]</param>
-                <param name="diffuse">$PARAM[diffuse]</param>
+            <control type="group">
+
+                <include content="$PARAM[content]">
+                    <param name="icon">$VAR[$PARAM[icon_base_var]$PARAM[affix]_$PARAM[pos]]</param>
+                    <param name="item_w">$PARAM[item_w]</param>
+                    <param name="item_h">$PARAM[item_h]</param>
+                    <param name="affix">$PARAM[affix]_$PARAM[pos]</param>
+                    <param name="listitem">Container($PARAM[id]).$PARAM[positional_listitem]($PARAM[pos])</param>
+                    <param name="id">$PARAM[id]</param>
+                    <param name="selected">$PARAM[selected]</param>
+                    <param name="detailed">$PARAM[detailed]</param>
+                    <param name="misc">$PARAM[misc]</param>
+                    <param name="variation">$PARAM[variation]</param>
+                    <param name="diffuse">$PARAM[diffuse]</param>
+                </include>
 
                 <include content="Animation_ConditionalFade" condition="$PARAM[conditional_fade]">
                     <param name="condition">String.IsEmpty(Container($PARAM[id]).$PARAM[conditional_listitem]($PARAM[pos]).CurrentItem)</param>
                 </include>
-
                 <include content="Transitions_List_Row_Animation" condition="$PARAM[transition_animation]">
                     <param name="col">$PARAM[pos]</param>
                 </include>
 
                 <left>$PARAM[prefix]_posx_$PARAM[pos]</left>
+                <width>$PARAM[item_w]</width>
+                <height>$PARAM[item_h]</height>
 
-                <nested />
-            </include>
+                <visible>$PARAM[visible]</visible>
+
+                <include content="Transitions_List_Row_Item_Alt_Visible" condition="$PARAM[use_alternate]">
+                    <param name="id">$PARAM[id]</param>
+                    <param name="pos">$PARAM[pos]</param>
+                    <param name="condition_prefix">$PARAM[use_alternate_condition_prefix]</param>
+                </include>
+                <include content="Transitions_List_Row_Item_Alt_Slide" condition="$PARAM[use_alternate]">
+                    <param name="id">$PARAM[id]</param>
+                    <param name="pos">$PARAM[pos]</param>
+                    <param name="end">$PARAM[alt_slide]</param>
+                </include>
+
+                <include>$PARAM[include_animation]</include>
+
+            </control>
         </definition>
     </include>
 
@@ -212,17 +231,10 @@
                 <param name="transition_animation">$PARAM[transition_animation]</param>
                 <param name="conditional_fade">$PARAM[conditional_fade]</param>
                 <param name="selected">$PARAM[selected]</param>
-                <include content="Transitions_List_Row_Item_Alt_Visible" condition="$PARAM[use_alternate]">
-                    <param name="id">$PARAM[id]</param>
-                    <param name="pos">$PARAM[pos]</param>
-                    <param name="condition_prefix">!</param>
-                </include>
-                <include content="Transitions_List_Row_Item_Alt_Slide" condition="$PARAM[use_alternate]">
-                    <param name="id">$PARAM[id]</param>
-                    <param name="pos">$PARAM[pos]</param>
-                    <param name="end">$PARAM[alt_slide]</param>
-                </include>
-                <nested />
+                <param name="visible">$PARAM[visible]</param>
+                <param name="include_animation">$PARAM[include_animation]</param>
+                <param name="use_alternate">$PARAM[use_alternate]</param>
+                <param name="use_alternate_condition_prefix">!</param>
             </include>
             <include content="_Transitions_List_Row_Item" condition="$PARAM[use_alternate]">
                 <param name="detailed">$PARAM[detailed]</param>
@@ -242,16 +254,10 @@
                 <param name="transition_animation">$PARAM[transition_animation]</param>
                 <param name="conditional_fade">$PARAM[conditional_fade]</param>
                 <param name="selected">$PARAM[selected]</param>
-                <include content="Transitions_List_Row_Item_Alt_Visible">
-                    <param name="id">$PARAM[id]</param>
-                    <param name="pos">$PARAM[pos]</param>
-                </include>
-                <include content="Transitions_List_Row_Item_Alt_Slide">
-                    <param name="id">$PARAM[id]</param>
-                    <param name="pos">$PARAM[pos]</param>
-                    <param name="end">$PARAM[alt_slide]</param>
-                </include>
-                <nested />
+                <param name="visible">$PARAM[visible]</param>
+                <param name="include_animation">$PARAM[include_animation]</param>
+                <param name="alt_slide">$PARAM[alt_slide]</param>
+                <param name="use_alternate">$PARAM[use_alternate]</param>
             </include>
         </definition>
     </include>
@@ -285,7 +291,7 @@
                     <param name="positional_listitem">$PARAM[positional_listitem]</param>
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">False</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -308,7 +314,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.01),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.01),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -331,7 +337,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.02),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.02),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -354,7 +360,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.03),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.03),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -377,7 +383,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.04),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.04),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -400,7 +406,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.05),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.05),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -423,7 +429,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.06),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.06),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
                     <param name="detailed">$PARAM[detailed]</param>
@@ -446,7 +452,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
 
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.07),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.07),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
@@ -470,7 +476,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
 
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.08),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.08),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
@@ -494,7 +500,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
 
                 <include content="Transitions_List_Row_Item" condition="[!Integer.IsGreater(Skin.String(SkinConstant.Numeric.09),$PARAM[item_count]) + [!Skin.HasSetting(Views.DisableItemPeek) | !Integer.IsEqual(Skin.String(SkinConstant.Numeric.09),$PARAM[item_count])]] | !String.IsEqual(Skin.AspectRatio,16:9)">
@@ -518,7 +524,7 @@
                     <param name="conditional_listitem">$PARAM[conditional_listitem]</param>
                     <param name="use_alternate">$PARAM[use_alternate]</param>
                     <param name="alt_slide">$PARAM[alt_slide]</param>
-                    <visible>$PARAM[visible]</visible>
+                    <param name="visible">$PARAM[visible]</param>
                 </include>
             </control>
         </definition>

diff --git a/1080i/Includes_Widgets.xml b/1080i/Includes_Widgets.xml
@@ -313,6 +313,15 @@
         </control>
     </include>
 
+    <include name="Widget_Fake_Row_PreItem_Animation">
+        <include content="Animation_Fade_In">
+            <param name="type">Visible</param>
+        </include>
+        <include content="Animation_Fade_Out">
+            <param name="type">Hidden</param>
+        </include>
+    </include>
+
     <include name="Widget_Fake_Row">
         <param name="content">Layout_Landscape</param>
         <param name="icon_base_var">Image_Landscape</param>
@@ -341,14 +350,8 @@
                     <param name="prefix">$PARAM[prefix]</param>
                     <param name="affix">$PARAM[affix]</param>
                     <param name="transition_animation">false</param>
-                    <include content="Animation_Fade_In">
-                        <param name="type">Visible</param>
-                        <param name="delay">0</param>
-                    </include>
-                    <include content="Animation_Fade_Out">
-                        <param name="type">Hidden</param>
-                    </include>
-                    <visible>Control.HasFocus($PARAM[id]) | $PARAM[overhang_visible]</visible>
+                    <param name="visible">Control.HasFocus($PARAM[id]) | $PARAM[overhang_visible]</param>
+                    <param name="include_animation">Widget_Fake_Row_PreItem_Animation</param>
                 </include>
 
                 <!-- Focus -->
@@ -363,7 +366,7 @@
                     <param name="affix">$PARAM[affix]</param>
                     <param name="transition_animation">false</param>
                     <param name="selected">true</param>
-                    <visible>Control.HasFocus($PARAM[id])</visible>
+                    <param name="visible">Control.HasFocus($PARAM[id])</param>
                 </include>
                 <include content="Transitions_List_Row_Item">
                     <param name="pos">0</param>
@@ -376,7 +379,7 @@
                     <param name="affix">$PARAM[affix]</param>
                     <param name="transition_animation">false</param>
                     <param name="selected">false</param>
-                    <visible>![Control.HasFocus($PARAM[id])]</visible>
+                    <param name="visible">![Control.HasFocus($PARAM[id])]</param>
                 </include>
 
                 <!-- Rest of Items -->