🧰 Nesting cleanup

jurialmunkey · Apr 17, 2024 · 4e9484c · 4e9484c
1 parent af3ff26
commit 4e9484c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/1080i/Includes_Search_View.xml b/1080i/Includes_Search_View.xml
@@ -170,7 +170,8 @@
             <include content="MediaWall_View_Transition" condition="$EXP[Exp_FilterWall_IsEnabled]">
                 <param name="condition">$EXP[Exp_MediaFilter_IsActive]</param>
             </include>
-            <include content="Transitions_List_Group">
+            <control type="group">
+                <include>Transitions_List_Visibility</include>
                 <include content="List_Square_Row">
                     <param name="id">50</param>
                     <height>divider_bottom</height>
@@ -227,7 +228,7 @@
                     <pagecontrol>60</pagecontrol>
                     <onfocus>SetProperty(TMDbHelper.WidgetContainer,52)</onfocus>
                 </include>
-            </include>
+            </control>
             <include>Transitions_List_Poster_Row</include>
         </control>
 

diff --git a/1080i/Includes_Transitions.xml b/1080i/Includes_Transitions.xml
@@ -842,11 +842,4 @@
         </definition>
     </include>
 
-    <include name="Transitions_List_Group">
-        <control type="group">
-            <include>Transitions_List_Visibility</include>
-            <nested />
-        </control>
-    </include>
-
 </includes>
diff --git a/1080i/Includes_Views_Combined.xml b/1080i/Includes_Views_Combined.xml
@@ -115,7 +115,8 @@
                 <animation effect="slide" start="$PARAM[slide_x]" end="0" tween="quadratic" easing="out" time="400" reversible="false" condition="[Control.HasFocus($PARAM[id]3) | Control.HasFocus(60) | Control.HasFocus(332) | Control.HasFocus(68) | Control.HasFocus(62) | [Control.HasFocus(330) + Integer.IsEqual(Window.Property(List.ViewContainer),$PARAM[id]3)]]">Conditional</animation>
                 <animation effect="slide" start="0" end="$PARAM[slide_x]" tween="quadratic" easing="out" time="400" reversible="false" condition="![Control.HasFocus($PARAM[id]3) | Control.HasFocus(60) | Control.HasFocus(332) | Control.HasFocus(68) | Control.HasFocus(62) | [Control.HasFocus(330) + Integer.IsEqual(Window.Property(List.ViewContainer),$PARAM[id]3)]]">Conditional</animation>
                 <visible>Control.IsVisible($PARAM[id]2)</visible>
-                <include content="Transitions_List_Group">
+                <control type="group">
+                    <include>Transitions_List_Visibility</include>
                     <include content="$PARAM[include]">
                         <param name="id">$PARAM[id]3</param>
                         <height>divider_bottom</height>
@@ -176,7 +177,7 @@
                         </animation>
                         <visible>!Control.HasFocus($PARAM[id]3)</visible>
                     </include>
-                </include>
+                </control>
                 <include content="Transitions_$PARAM[include]">
                     <param name="id">$PARAM[id]3</param>
                     <param name="affix">_C$PARAM[id]3</param>
@@ -190,7 +191,8 @@
         <definition>
             <control type="group">
                 <visible>Control.IsVisible($PARAM[id]2)</visible>
-                <include content="Transitions_List_Group">
+                <control type="group">
+                    <include>Transitions_List_Visibility</include>
                     <include content="$PARAM[include]">
                         <param name="id">$PARAM[id]3</param>
                         <height>divider_bottom</height>
@@ -238,7 +240,7 @@
                         <bottom>46</bottom>
                         <left>200</left>
                     </include>
-                </include>
+                </control>
                 <include content="Transitions_$PARAM[include]">
                     <param name="id">$PARAM[id]3</param>
                     <param name="affix">_C$PARAM[id]3</param>

diff --git a/1080i/Includes_Views_Row.xml b/1080i/Includes_Views_Row.xml
@@ -46,7 +46,8 @@
         <definition>
             <control type="group">
                 <visible>Control.IsVisible($PARAM[id])</visible>
-                <include content="Transitions_List_Group">
+                <control type="group">
+                    <include>Transitions_List_Visibility</include>
                     <include content="$PARAM[include]">
                         <param name="id">$PARAM[id]</param>
                         <height>divider_bottom</height>
@@ -68,7 +69,7 @@
                             <param name="h">view_poster_item_h</param>
                         </include>
                     </include>
-                </include>
+                </control>
                 <include>Transitions_$PARAM[include]</include>
             </control>
         </definition>