🐎 More removal of nested includes

jurialmunkey · May 31, 2024 · 714c486 · 714c486
1 parent e0b0883
commit 714c486
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 80 deletions.
diff --git a/1080i/Custom_1180_Wizard.xml b/1080i/Custom_1180_Wizard.xml
@@ -21,7 +21,8 @@
             <bottom>40</bottom>
             <width>1500</width>
             <centerleft>50%</centerleft>
-            <include content="Dialog_Background_Blur">
+            <control type="group">
+                <include>Dialog_Background_Blur</include>
                 <include>Animation_Right_Delay</include>
                 <include content="Dialog_Head">
                     <param name="top">40</param>
@@ -381,7 +382,7 @@
                         <visible>!String.IsEqual(Window(Home).Property(WizardStep),Dialog)</visible>
                     </control>
                 </control>
-            </include>
+            </control>
         </control>
 
 

diff --git a/1080i/DialogConfirm.xml b/1080i/DialogConfirm.xml
@@ -11,8 +11,10 @@
             <include>Animation_SlideIn_Dialog</include>
             <control type="group">
                 <include>Dimension_DialogConfirm</include>
-                <include content="Dialog_Background_Blur">
-                    <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                        <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                    </include>
                     <include content="Dialog_Head">
                         <param name="top">40</param>
                         <param name="left">40</param>
@@ -94,7 +96,7 @@
                             <include>defs_dialog_button</include>
                         </control>
                     </control>
-                </include>
+                </control>
             </control>
         </control>
     </controls>

diff --git a/1080i/DialogPlayerProcessInfo.xml b/1080i/DialogPlayerProcessInfo.xml
@@ -10,7 +10,9 @@
         </include>
         <control type="group">
             <left>view_side</left>
-            <include content="Dialog_Background_Blur">
+            <control type="group">
+                <include content="Dialog_Background_Blur">
+                </include>
                 <include content="Animation_SlideIn_Dialog">
                     <param name="windowopen_delay">200</param>
                 </include>
@@ -238,7 +240,7 @@
                         <visible>!VideoPlayer.Content(livetv)</visible>
                     </control>
                 </control>
-            </include>
+            </control>
             <control type="group">
                 <centerbottom>100</centerbottom>
                 <right>view_pad</right>

diff --git a/1080i/Includes_DialogInfo.xml b/1080i/Includes_DialogInfo.xml
@@ -355,10 +355,12 @@
                 <bottom>0</bottom>
                 <right>240</right>
                 <left>1020</left>
-                <include content="Dialog_Background_Blur">
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                    </include>
                     <animation effect="fade" end="90" condition="true">Conditional</animation>
                     <param name="diffuse">diffuse/card_w800_h294.png</param>
-                </include>
+                </control>
                 <control type="image">
                     <texture colordiffuse="panel_fg_12" border="20">common/dialog.png</texture>
                 </control>

diff --git a/1080i/Includes_Dialogs.xml b/1080i/Includes_Dialogs.xml
@@ -55,23 +55,20 @@
     </include>
 
     <include name="Dialog_Background_Blur">
-        <control type="group">
-            <include content="Dialog_Background_Blur_Standard" condition="!$EXP[Exp_DialogTheme_IsAdaptive]">
-                <param name="shadow">$PARAM[shadow]</param>
-                <param name="flipy">$PARAM[flipy]</param>
-                <param name="flipx">$PARAM[flipx]</param>
-                <param name="diffuse">$PARAM[diffuse]</param>
-                <param name="border">$PARAM[border]</param>
-            </include>
-            <include content="Dialog_Background_Blur_Adaptive" condition="$EXP[Exp_DialogTheme_IsAdaptive]">
-                <param name="shadow">$PARAM[shadow]</param>
-                <param name="flipy">$PARAM[flipy]</param>
-                <param name="flipx">$PARAM[flipx]</param>
-                <param name="diffuse">$PARAM[diffuse]</param>
-                <param name="border">$PARAM[border]</param>
-            </include>
-            <nested />
-        </control>
+        <include content="Dialog_Background_Blur_Standard" condition="!$EXP[Exp_DialogTheme_IsAdaptive]">
+            <param name="shadow">$PARAM[shadow]</param>
+            <param name="flipy">$PARAM[flipy]</param>
+            <param name="flipx">$PARAM[flipx]</param>
+            <param name="diffuse">$PARAM[diffuse]</param>
+            <param name="border">$PARAM[border]</param>
+        </include>
+        <include content="Dialog_Background_Blur_Adaptive" condition="$EXP[Exp_DialogTheme_IsAdaptive]">
+            <param name="shadow">$PARAM[shadow]</param>
+            <param name="flipy">$PARAM[flipy]</param>
+            <param name="flipx">$PARAM[flipx]</param>
+            <param name="diffuse">$PARAM[diffuse]</param>
+            <param name="border">$PARAM[border]</param>
+        </include>
     </include>
 
     <include name="Dialog_Background_BlurDimension_DialogSideMenu">
@@ -537,7 +534,9 @@
         <include content="Animation_Fade_Out">
             <param name="type">WindowClose</param>
         </include>
-        <include content="Dialog_Background_Blur">
+        <control type="group">
+            <include content="Dialog_Background_Blur">
+            </include>
             <control type="image">
                 <texture colordiffuse="main_fg_12" border="20">common/dialog.png</texture>
             </control>
@@ -550,7 +549,7 @@
                     </control>
                 </include>
             </control>
-        </include>
+        </control>
     </include>
 
     <include name="Dialog_Outline">
@@ -627,8 +626,10 @@
         <param name="include_dimensions">Dimension_Dialog_VideoPIP_Smaller</param>
         <param name="visible">true</param>
         <definition>
-            <include content="Dialog_Background_Blur">
-                <param name="diffuse">diffuse/landscape_w720_h405.png</param>
+            <control type="group">
+                <include content="Dialog_Background_Blur">
+                    <param name="diffuse">diffuse/landscape_w720_h405.png</param>
+                </include>
                 <include>$PARAM[include_dimensions]</include>
                 <control type="image">
                     <texture colordiffuse="dialog_fg_12" border="20">common/dialog.png</texture>
@@ -725,7 +726,7 @@
                     </control>
 
                 </control>
-            </include>
+            </control>
         </definition>
     </include>
 </includes>
diff --git a/1080i/Includes_Furniture.xml b/1080i/Includes_Furniture.xml
@@ -393,10 +393,12 @@
         <definition>
             <control type="group">
                 <top>-320</top>
-                <include content="Dialog_Background_Blur">
-                    <param name="diffuse">diffuse/dialog_w480_h400.png</param>
-                    <param name="flipy">true</param>
-                </include>
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                        <param name="diffuse">diffuse/dialog_w480_h400.png</param>
+                        <param name="flipy">true</param>
+                    </include>
+                </control>
                 <control type="image">
                     <texture colordiffuse="dialog_fg_12" border="20">common/dialog.png</texture>
                 </control>

diff --git a/1080i/Includes_Keyboard.xml b/1080i/Includes_Keyboard.xml
@@ -18,9 +18,12 @@
             <control type="group">
                 <left>60</left>
                 <right>-60</right>
-                <include content="Dialog_Background_Blur" condition="$EXP[Exp_AutoCompletion_IsEnabled]">
-                    <param name="shadow">false</param>
-                    <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                <control type="group">
+                    <visible>$EXP[Exp_AutoCompletion_IsEnabled]</visible>
+                    <include content="Dialog_Background_Blur">
+                        <param name="shadow">false</param>
+                        <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                    </include>
                     <animation effect="slide" start="0" end="0,-80" time="400" condition="$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)" tween="cubic" easing="out" reversible="false">Conditional</animation>
                     <animation effect="slide" start="0,-80" end="0" time="400" condition="![$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)]" tween="cubic" easing="out" reversible="false">Conditional</animation>
                     <control type="fixedlist" id="8000">
@@ -66,12 +69,12 @@
                         </focusedlayout>
                         <content>plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]</content>
                     </control>
-                </include>
-                <include content="Dialog_Background_Blur">
-                    <param name="shadow">false</param>
-                    <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
-                    <!-- <animation effect="slide" start="0" end="0,-80" time="400" condition="$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)" tween="cubic" easing="out" reversible="false">Conditional</animation>
-                    <animation effect="slide" start="0,-80" end="0" time="400" condition="![$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)]" tween="cubic" easing="out" reversible="false">Conditional</animation> -->
+                </control>
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                        <param name="shadow">false</param>
+                        <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                    </include>
                     <control type="image">
                         <texture colordiffuse="dialog_fg_12" border="20">common/dialog.png</texture>
                     </control>
@@ -601,7 +604,7 @@
                             </control>
                         </control>
                     </control>
-                </include>
+                </control>
             </control>
         </control>
     </include>
@@ -616,7 +619,9 @@
             <include>Animation_SlideIn_Dialog</include>
             <control type="group">
                 <include>Dimension_DialogNumeric</include>
-                <include content="Dialog_Background_Blur">
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                    </include>
                     <include content="Dialog_Head">
                         <param name="textcolor">main_fg_100</param>
                         <param name="top">40</param>
@@ -805,7 +810,7 @@
                             <include>defs_dialog_button</include>
                         </control>
                     </control>
-                </include>
+                </control>
             </control>
         </control>
     </include>

diff --git a/1080i/Includes_Keyboard_Mini.xml b/1080i/Includes_Keyboard_Mini.xml
@@ -2,9 +2,12 @@
 <includes>
 
     <include name="Keyboard_Mini_Autocomplete">
-        <include content="Dialog_Background_Blur" condition="$EXP[Exp_AutoCompletion_IsEnabled]">
-            <param name="shadow">true</param>
-            <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+        <control type="group">
+            <visible>$EXP[Exp_AutoCompletion_IsEnabled]</visible>
+            <include content="Dialog_Background_Blur">
+                <param name="shadow">true</param>
+                <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+            </include>
 
             <animation effect="slide" start="0" end="0,-60" time="400" condition="$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)" tween="cubic" easing="out" reversible="false">Conditional</animation>
             <animation effect="slide" start="0,-60" end="0" time="400" condition="![$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)]" tween="cubic" easing="out" reversible="false">Conditional</animation>
@@ -56,7 +59,7 @@
                 </focusedlayout>
                 <content>plugin://plugin.program.autocompletion?info=autocomplete&amp;&amp;id=$INFO[Control.GetLabel(312).index(1)]</content>
             </control>
-        </include>
+        </control>
     </include>
 
     <include name="Keyboard_Mini">
@@ -75,11 +78,10 @@
                 <height>360</height>
                 <include>Animation_SlideIn_Dialog</include>
                 <include>Keyboard_Mini_Autocomplete</include>
-                <include content="Dialog_Background_Blur">
-                    <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
-                    <!-- <animation effect="slide" start="0" end="0,-60" time="400" condition="$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)" tween="cubic" easing="out" reversible="false">Conditional</animation>
-                    <animation effect="slide" start="0,-60" end="0" time="400" condition="![$EXP[Exp_AutoCompletion_IsEnabled] + !Integer.IsEqual(Container(8000).NumItems,0)]" tween="cubic" easing="out" reversible="false">Conditional</animation> -->
-
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                        <param name="diffuse">diffuse/dialog_w1120_h400.png</param>
+                    </include>
                     <control type="image">
                         <texture colordiffuse="dialog_fg_12" border="20">common/dialog.png</texture>
                     </control>
@@ -605,7 +607,7 @@
                             </control>
                         </control>
                     </control>
-                </include>
+                </control>
             </control>
         </control>
     </include>
@@ -625,12 +627,16 @@
                 <width>320</width>
                 <height>370</height>
                 <include>Animation_SlideIn_Dialog</include>
-                <include content="Dialog_Background_Blur" condition="$EXP[Exp_AutoCompletion_IsEnabled]">
-                    <param name="shadow">false</param>
-                    <param name="diffuse">diffuse/dialog_w480_h400.png</param>
-                </include>
-                <include content="Dialog_Background_Blur">
-                    <param name="diffuse">diffuse/dialog_w480_h400.png</param>
+                <control type="group">
+                    <include content="Dialog_Background_Blur" condition="$EXP[Exp_AutoCompletion_IsEnabled]">
+                        <param name="shadow">false</param>
+                        <param name="diffuse">diffuse/dialog_w480_h400.png</param>
+                    </include>
+                </control>
+                <control type="group">
+                    <include content="Dialog_Background_Blur">
+                        <param name="diffuse">diffuse/dialog_w480_h400.png</param>
+                    </include>
                     <bottom>60</bottom>
                     <control type="image">
                         <texture colordiffuse="dialog_fg_12" border="20">common/dialog.png</texture>
@@ -791,7 +797,7 @@
                             <ondown>15</ondown>
                         </include>
                     </control>
-                </include>
+                </control>
             </control>
         </control>
     </include>

diff --git a/1080i/Includes_OSD.xml b/1080i/Includes_OSD.xml
@@ -316,41 +316,55 @@
                     <animation effect="slide" start="0" end="0,320" condition="Integer.IsEqual(Container($PARAM[id]).NumItems,3)">Conditional</animation>
                     <animation effect="slide" start="0" end="0,400" condition="Integer.IsEqual(Container($PARAM[id]).NumItems,2)">Conditional</animation>
                     <animation effect="slide" start="0" end="0,480" condition="Integer.IsLess(Container($PARAM[id]).NumItems,2)">Conditional</animation>
-                    <include content="Dialog_Background_Blur">
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>760</height>
                         <visible>Integer.IsGreater(Container($PARAM[id]).NumItems,6)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>680</height>
                         <visible>Integer.IsEqual(Container($PARAM[id]).NumItems,6)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>600</height>
                         <visible>Integer.IsEqual(Container($PARAM[id]).NumItems,5)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>520</height>
                         <visible>Integer.IsEqual(Container($PARAM[id]).NumItems,4)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>440</height>
                         <visible>Integer.IsEqual(Container($PARAM[id]).NumItems,3)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>360</height>
                         <visible>Integer.IsEqual(Container($PARAM[id]).NumItems,2)</visible>
-                    </include>
-                    <include content="Dialog_Background_Blur">
+                    </control>
+                    <control type="group">
+                        <include content="Dialog_Background_Blur">
+                        </include>
                         <include>OSD_Stream_Selector_Divider</include>
                         <height>280</height>
                         <visible>Integer.IsLess(Container($PARAM[id]).NumItems,2)</visible>
-                    </include>
+                    </control>
                     <include content="Object_MenuHeader">
                         <param name="label">$PARAM[header]</param>
                     </include>