🐛 Fix combined stack not being properly global

jurialmunkey · Oct 17, 2023 · eeee331 · eeee331
1 parent 0400ba2
commit eeee331
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 24 deletions.
diff --git a/1080i/Includes_Hubs.xml b/1080i/Includes_Hubs.xml
@@ -103,23 +103,23 @@
             <include>Background_Transition</include>
 
             <include content="Hub_Main_Group">
-                <param name="widgets_only">$PARAM[widgets_only]</param>
+                <param name="widgets_only">[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]</param>
 
-                <include content="Hub_Menu_Group" condition="![$PARAM[widgets_only]]">
+                <include content="Hub_Menu_Group" condition="![[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]">
                     <include content="Hub_Categories">
                         <param name="categories_include">$PARAM[categories_include]</param>
                         <param name="window_id">$PARAM[window_id]</param>
                     </include>
                 </include>
 
                 <!-- Spotlight: Individual -->
-                <include content="Spotlight_List" condition="![$PARAM[widgets_only]]">
+                <include content="Spotlight_List" condition="![[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]">
                     <param name="window_id">$PARAM[window_id]</param>
                     <visible>String.IsEmpty(Container(300).ListItem.Property(widgetPath.Spotlight))</visible>
                 </include>
 
-                <include condition="![$PARAM[widgets_only]]">$PARAM[include]</include>
-                <include content="Hub_Widgets_Only" condition="$PARAM[widgets_only]">
+                <include condition="![[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]">$PARAM[include]</include>
+                <include content="Hub_Widgets_Only" condition="[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]">
                     <param name="widgets_include">$PARAM[widgets_include]</param>
                 </include>
 
@@ -200,7 +200,7 @@
             <include>Animation_View_WindowChange</include>
             <include>Animation_Group_Bumper</include>
 
-            <include condition="![$PARAM[widgets_only]]">Spotlight_Info</include>
+            <include condition="![[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]">Spotlight_Info</include>
 
             <nested />
         </control>
@@ -255,12 +255,12 @@
             <top>940</top>
             <bottom>-440</bottom>
 
-            <include condition="![$PARAM[widgets_only]]">Hub_Widgets_Grouplist__Def_Layout_Expanded</include>
-            <include condition="[$PARAM[widgets_only]]" content="Hub_Widgets_Grouplist__Def_Layout_Basic">
+            <include condition="![[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]">Hub_Widgets_Grouplist__Def_Layout_Expanded</include>
+            <include condition="[[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]]" content="Hub_Widgets_Grouplist__Def_Layout_Basic">
                 <param name="id">$PARAM[id]</param>
             </include>
 
-            <include content="Action_Widget_End" condition="[$PARAM[widgets_only]] | !Skin.String(Movement.Content.OnDown,Loop)">
+            <include content="Action_Widget_End" condition="[[$PARAM[widgets_only] | Skin.HasSetting(Hubs.WidgetSelector)]] | !Skin.String(Movement.Content.OnDown,Loop)">
                 <param name="topid">$PARAM[topid]</param>
                 <param name="id">$PARAM[id]</param>
             </include>

diff --git a/1080i/Includes_Items.xml b/1080i/Includes_Items.xml
@@ -462,6 +462,7 @@
 
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31105][/B][CR]$LOCALIZE[31289],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_SideMenu_$PARAM[item])</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
         <include content="Settings_Button" description="Categories">
             <param name="id">8$PARAM[item]07</param>
@@ -485,6 +486,7 @@
 
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31150][/B][CR]$LOCALIZE[31291] $LOCALIZE[31446] $LOCALIZE[31328],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_SideMenu_$PARAM[item])</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
 
         <include content="Settings_Button" description="Widgets">
@@ -503,7 +505,7 @@
 
             <visible>[Skin.String(CustomShortcut.Item0$PARAM[item],movies) + String.IsEmpty(Skin.String(CustomShortcut.Movies))] | [Skin.String(CustomShortcut.Item0$PARAM[item],tvshows) + String.IsEmpty(Skin.String(CustomShortcut.TVShows))] | [Skin.String(CustomShortcut.Item0$PARAM[item],music)  + String.IsEmpty(Skin.String(CustomShortcut.Music))] | [Skin.String(CustomShortcut.Item0$PARAM[item],livetv) + String.IsEmpty(Skin.String(CustomShortcut.PVR))] | [Skin.String(CustomShortcut.Item0$PARAM[item],custom) + [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1106))] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1107))] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1108))] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1109))]]</visible>
 
-            <visible>[Skin.String(CustomShortcut.Item0$PARAM[item],movies) + Skin.HasSetting(Hub.Movies.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],tvshows) + Skin.HasSetting(Hub.TVShows.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],music) + Skin.HasSetting(Hub.Music.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],livetv) + Skin.HasSetting(Hub.PVR.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],custom) + [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1106)) + Skin.HasSetting(Hub.Custom01.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1107)) + Skin.HasSetting(Hub.Custom02.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1108)) + Skin.HasSetting(Hub.Custom03.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1109)) + Skin.HasSetting(Hub.Custom04.DisableSubmenu)]]</visible>
+            <visible>Skin.HasSetting(Hubs.WidgetSelector) | [[Skin.String(CustomShortcut.Item0$PARAM[item],movies) + Skin.HasSetting(Hub.Movies.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],tvshows) + Skin.HasSetting(Hub.TVShows.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],music) + Skin.HasSetting(Hub.Music.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],livetv) + Skin.HasSetting(Hub.PVR.DisableSubmenu)] | [Skin.String(CustomShortcut.Item0$PARAM[item],custom) + [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1106)) + Skin.HasSetting(Hub.Custom01.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1107)) + Skin.HasSetting(Hub.Custom02.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1108)) + Skin.HasSetting(Hub.Custom03.DisableSubmenu)] | [Skin.String(CustomShortcut.Custom0$PARAM[item],ActivateWindow(1109)) + Skin.HasSetting(Hub.Custom04.DisableSubmenu)]]]</visible>
 
             <onfocus>SetProperty(Highlight,Layout)</onfocus>
 
@@ -541,6 +543,7 @@
 
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31120][/B][CR]$LOCALIZE[31303],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_SideMenu_$PARAM[item])</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
         <include content="Settings_Button" description="CustomHubSubmenus">
             <param name="id">8$PARAM[item]11</param>
@@ -563,6 +566,7 @@
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31120][/B][CR]$LOCALIZE[31303],Home)</onfocus>
 
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_SideMenu_$PARAM[item])</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
 
         <include content="Settings_Button" description="WidgetsSlideUp">
@@ -583,6 +587,7 @@
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31444][/B][CR]$LOCALIZE[31433][CR][CR]$LOCALIZE[31344],Home)</onfocus>
 
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_SideMenu_$PARAM[item])</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
     </include>
 
@@ -1326,6 +1331,7 @@
             <onfocus>SetProperty(MenuHighlight,MenuHome)</onfocus>
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31105][/B][CR]$LOCALIZE[31289],Home)</onfocus>
             <visible>!Skin.HasSetting(Hub.Home.DisableSubmenu)</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_HomeMenu)</visible>
         </include>
         <include content="Settings_Button" description="Categories">
@@ -1336,6 +1342,7 @@
             <onfocus>SetProperty(MenuHighlight,MenuHome)</onfocus>
             <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=mainmenu)</onclick>
             <visible>!Skin.HasSetting(Hub.Home.DisableSubmenu)</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31150][/B][CR]$LOCALIZE[31291] $LOCALIZE[31446] $LOCALIZE[31328],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_HomeMenu)</visible>
         </include>
@@ -1346,7 +1353,7 @@
             <onfocus>SetProperty(Highlight,Layout)</onfocus>
             <onfocus>SetProperty(MenuHighlight,MenuHome)</onfocus>
             <onclick>RunScript(script.skinshortcuts,type=manage&amp;group=mainwidgets)</onclick>
-            <visible>Skin.HasSetting(Hub.Home.DisableSubmenu)</visible>
+            <visible>Skin.HasSetting(Hub.Home.DisableSubmenu) | Skin.HasSetting(Hubs.WidgetSelector)</visible>
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31103][/B][CR]$LOCALIZE[31445],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_HomeMenu)</visible>
         </include>
@@ -1370,6 +1377,7 @@
             <onfocus>SetProperty(MenuHighlight,MenuHome)</onfocus>
             <onfocus>SetProperty(CustomDialogSettingsLabel,[B]$LOCALIZE[31120][/B][CR]$LOCALIZE[31303],Home)</onfocus>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_HomeMenu)</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
         <include content="Settings_Button" description="WidgetsSlideUp">
             <param name="id">8804</param>
@@ -1385,6 +1393,7 @@
 
             <visible>!Skin.HasSetting(Hub.Home.DisableSubmenu)</visible>
             <visible>String.IsEqual(Window(Home).Property(CustomDialogSettingsItems),Items_Settings_HomeMenu)</visible>
+            <visible>!Skin.HasSetting(Hubs.WidgetSelector)</visible>
         </include>
 
     </include>

diff --git a/shortcuts/skinvariables-generator.json b/shortcuts/skinvariables-generator.json
@@ -47,7 +47,7 @@
             "posterid": "$PARAM[base_id]603",
             "topid": "$PARAM[base_id]604",
             "refocus": "SetFocus(393)",
-            "visible": "[[!Skin.HasSetting(Hubs.WidgetSelector) | [Integer.IsEqual(Container($PARAM[base_id]419).ListItem.Property(id),$SKINSHORTCUTS[id]) + String.IsEmpty(Window.Property(Item.$PARAM[base_id]302.SpecialFolderLabel))]] + String.IsEqual(Container(300).ListItem.Property(submenuVisibility),$SKINSHORTCUTS[submenuVisibility])]",
+            "visible": "[[!Skin.HasSetting(Hubs.WidgetSelector) | [Integer.IsEqual(Container($PARAM[base_id]419).ListItem.Property(id),$SKINSHORTCUTS[id]) + String.IsEmpty(Window.Property(Item.$PARAM[base_id]302.SpecialFolderLabel))]]]",
             "altvisible": "[$SKINSHORTCUTS[widgetAltVisible]]",
             "include_condition": "$SKINSHORTCUTS[isVisible]"
         }
@@ -92,7 +92,7 @@
                 "posterid": "$PYTHON[int(mainmenuid) * 1000 + 603]",
                 "topid": "$PYTHON[int(mainmenuid) * 1000 + 604]",
                 "refocus": "SetFocus(393)",
-                "visible": "[[!Skin.HasSetting(Hubs.WidgetSelector) | [Integer.IsEqual(Container($PYTHON[int(mainmenuid) * 1000 + 419]).ListItem.Property(id),$SKINSHORTCUTS[id]) + String.IsEmpty(Window.Property(Item.$PYTHON[int(mainmenuid) * 1000 + 302].SpecialFolderLabel))]] + String.IsEqual(Container(300).ListItem.Property(submenuVisibility),$SKINSHORTCUTS[submenuVisibility])]",
+                "visible": "[[!Skin.HasSetting(Hubs.WidgetSelector) | [Integer.IsEqual(Container($PYTHON[int(mainmenuid) * 1000 + 419]).ListItem.Property(id),$SKINSHORTCUTS[id]) + String.IsEmpty(Window.Property(Item.$PYTHON[int(mainmenuid) * 1000 + 302].SpecialFolderLabel))]]]",
                 "altvisible": "[$SKINSHORTCUTS[widgetAltVisible]]",
                 "include_condition": "$SKINSHORTCUTS[isVisible]"
             }