⚡ Various adjustments to focus

jurialmunkey · Mar 6, 2024 · 8b40d6f · 8b40d6f
1 parent 66600c5
commit 8b40d6f
Show file tree

Hide file tree

Showing 23 changed files with 76 additions and 66 deletions.
diff --git a/1080i/Custom_1101_Hub_Movies.xml b/1080i/Custom_1101_Hub_Movies.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1101">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1102_Hub_TVShows.xml b/1080i/Custom_1102_Hub_TVShows.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1102">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1103_Hub_Music.xml b/1080i/Custom_1103_Hub_Music.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1103">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1104_Hub_PVR.xml b/1080i/Custom_1104_Hub_PVR.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1104">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Hubs_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1106_Hub_Custom1.xml b/1080i/Custom_1106_Hub_Custom1.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1106">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1107_Hub_Custom2.xml b/1080i/Custom_1107_Hub_Custom2.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1107">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1108_Hub_Custom3.xml b/1080i/Custom_1108_Hub_Custom3.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1108">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1109_Hub_Custom4.xml b/1080i/Custom_1109_Hub_Custom4.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window type="window" id="1109">
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <include content="Action_Hubs_Onload">

diff --git a/1080i/Custom_1198_Window_Startup.xml b/1080i/Custom_1198_Window_Startup.xml
@@ -67,19 +67,19 @@
     <onload condition="String.IsEmpty(Skin.String(CustomRating.TVShows.Item04))">Skin.SetString(CustomRating.TVShows.Item04,Awards)</onload>
 
     <!-- Set Default Containers -->
-    <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,Home)</onload>
+    <!-- <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,Home)</onload>
     <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,1101)</onload>
     <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,1102)</onload>
     <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,1103)</onload>
-    <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,1104)</onload>
+    <onload condition="String.IsEmpty(Window.Property(ReloadDone))">SetProperty(TMDbHelper.widgetContainer,301,1104)</onload> -->
 
     <!-- Build includes for textures / views / menus -->
     <onload condition="String.IsEmpty(Window.Property(ReloadDone))">RunScript($VAR[Action_Var_BuildTextures],no_reload)</onload>
     <!-- <onload condition="String.IsEmpty(Window.Property(ReloadDone))">RunScript(script.skinvariables,action=buildviews)</onload> -->
     <onload condition="!String.IsEmpty(Window.Property(ReloadDone))">SetProperty(InitStatus,$LOCALIZE[31248])</onload>
     <onload>SetProperty(ReloadDone,1)</onload>
     <onload>SetProperty(ReloadDone,1,Home)</onload>
-    <onload>SetProperty(TMDbHelper.WidgetContainer,301,Home)</onload>
+    <!-- <onload>SetProperty(TMDbHelper.WidgetContainer,301,Home)</onload> -->
     <onunload>ClearProperty(StartupReplaceWindow,Home)</onunload>
     <controls>
 

diff --git a/1080i/Home.xml b/1080i/Home.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <window>
-    <defaultcontrol>300</defaultcontrol>
     <menucontrol>303</menucontrol>
     <include>Action_Blur_Onload</include>
     <onload>Skin.SetString(TMDbHelper.MonitorContainer,99950)</onload>

diff --git a/1080i/Includes_Actions.xml b/1080i/Includes_Actions.xml
@@ -83,16 +83,28 @@
 
     <include name="Action_Hubs_Onload">
 
-        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetProperty(TMDbHelper.WidgetContainer,301)</onload>
-        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetFocus(300)</onload>
+        <include content="Object_DefaultControl" condition="Window.IsVisible(Home) + Skin.String(Home.SideMenuCollapse,Topbar)">
+            <param name="defaultcontrol">370</param>
+        </include>
+        <include content="Object_DefaultControl" condition="!Window.IsVisible(Home) | !Skin.String(Home.SideMenuCollapse,Topbar)">
+            <param name="defaultcontrol">303</param>
+        </include>
 
+        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(TMDbHelper.WidgetContainer,301)</onload>
+        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(List.ViewContainer,300)</onload>
+        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(List.ViewContainer.Left,300)</onload>
+        <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(TMDbHelper.WidgetContainer,601)</onload>
+        <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(List.ViewContainer,601)</onload>
+        <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(TMDbHelper.WidgetContainer))">SetProperty(List.ViewContainer.Left,601)</onload>
+
+        <!-- <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetProperty(TMDbHelper.WidgetContainer,301)</onload>
+        <onload condition="!Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetFocus(300)</onload>
         <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetProperty(TMDbHelper.WidgetContainer,601)</onload>
         <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetProperty(Slide.WidgetContainer,True)</onload>
         <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetFocus(303,0,absolute)</onload>
         <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">SetFocus(601)</onload>
         <onload condition="Skin.HasSetting(Hub.$PARAM[window_id].DisableSubmenu) + String.IsEmpty(Window.Property(InhibitHubPositionReset))">AlarmClock(refocus,SetFocus(601),00:00,silent)</onload>
-
-        <onload>SetProperty(InhibitHubPositionReset,True)</onload>
+        <onload>SetProperty(InhibitHubPositionReset,True)</onload> -->
 
         <include>Action_BuildShortcuts_OnLoad</include>
 

diff --git a/1080i/Includes_Expressions.xml b/1080i/Includes_Expressions.xml
@@ -82,7 +82,7 @@
 
     <expression name="Exp_HomeMenu_HasFocus">[[Control.HasFocus(303) | Control.HasFocus(308) | Control.HasFocus(309) | Control.HasFocus(331)] + !Window.IsVisible(1170)]</expression>
 
-    <expression name="Exp_HomeMenu_DontHide">[Skin.String(Home.SideMenuCollapse,Never) | [Skin.String(Home.SideMenuCollapse,Library) + Window.IsVisible(Home)] | [Skin.String(Home.SideMenuCollapse,Library) + !Skin.HasSetting(Hub.Home.DisableSubmenu) + $EXP[Exp_Window_IsHub]]]</expression>
+    <expression name="Exp_HomeMenu_DontHide">[!Skin.String(Home.SideMenuCollapse,Topbar) + [Skin.String(Home.SideMenuCollapse,Never) | [Skin.String(Home.SideMenuCollapse,Library) + Window.IsVisible(Home)] | [Skin.String(Home.SideMenuCollapse,Library) + !Skin.HasSetting(Hub.Home.DisableSubmenu) + $EXP[Exp_Window_IsHub]]]]</expression>
 
     <expression name="Exp_Window_IsHub">[Window.IsVisible(Home) | Window.IsVisible(1101) | Window.IsVisible(1102) | Window.IsVisible(1103) | Window.IsVisible(1104) | Window.IsVisible(1106) | Window.IsVisible(1107) | Window.IsVisible(1108) | Window.IsVisible(1109) | Window.IsVisible(1130) | Window.IsVisible(1131) | Window.IsVisible(1132)]</expression>
 

diff --git a/1080i/Includes_Hubs.xml b/1080i/Includes_Hubs.xml
@@ -150,26 +150,15 @@
 
             <include>Background_Transition</include>
 
-            <include content="Object_Hidden_Button" condition="$PARAM[widgets_only]">
-                <param name="id">300</param>
-                <onfocus>SetFocus(303)</onfocus>
-                <onleft>SetFocus(303)</onleft>
-                <onright>SetFocus(303)</onright>
-                <ondown>SetFocus(303)</ondown>
-                <onup>SetFocus(303)</onup>
-                <onback>SetFocus(303)</onback>
-                <onclick>SetFocus(303)</onclick>
-            </include>
-
             <include content="Hub_Main_Group">
                 <param name="widgets_only">[$PARAM[widgets_only]]</param>
-                <include content="Hub_Menu_Group" condition="![$PARAM[widgets_only]] + !Skin.HasSetting(Hubs.TopBarCategories)">
+                <include content="Hub_Menu_Group" condition="![$PARAM[widgets_only]]">
                     <include content="Hub_Categories">
                         <param name="categories">$PARAM[categories]</param>
                         <param name="window_id">$PARAM[window_id]</param>
                     </include>
                 </include>
-                <include content="Spotlight_List" condition="![$PARAM[widgets_only]] + !Skin.HasSetting(Hubs.TopBarCategories)">
+                <include content="Spotlight_List" condition="![$PARAM[widgets_only]]">
                     <param name="window_id">$PARAM[window_id]</param>
                     <param name="sortby">$PARAM[fullscreen_sortby]</param>
                     <param name="sortorder">$PARAM[fullscreen_sortorder]</param>
@@ -184,7 +173,7 @@
                     <param name="categories">$PARAM[categories]</param>
                     <param name="window_id">$PARAM[window_id]</param>
                 </include>
-                <include content="Hub_Widgets_Only" condition="$PARAM[widgets_only] + !Skin.HasSetting(Hubs.TopBarCategories)">
+                <include content="Hub_Widgets_Only" condition="$PARAM[widgets_only]">
                     <param name="widgets_include">$PARAM[widgets_include]</param>
                 </include>
             </include>
@@ -199,10 +188,8 @@
                 <visible>!$EXP[Exp_InfoDialogs]</visible>
                 <include>Animation_View_WindowChange</include>
                 <include>Animation_Group_Bumper</include>
-                <include condition="!Skin.HasSetting(Hubs.TopBarCategories)">Furniture_Top</include>
-                <include content="Hub_TopBar_Categories" condition="Skin.HasSetting(Hubs.TopBarCategories)">
-                    <param name="categories">$PARAM[categories]</param>
-                </include>
+                <include condition="![Window.IsVisible(Home) + Skin.String(Home.SideMenuCollapse,Topbar)]">Furniture_Top</include>
+                <include condition="Window.IsVisible(Home) + Skin.String(Home.SideMenuCollapse,Topbar)">Hub_TopBar_Categories</include>
             </control>
 
             <nested />
@@ -220,42 +207,48 @@
 
     <include name="Hub_TopBar_Categories">
         <control type="group">
-            <visible>!Control.HasFocus(300)</visible>
+            <visible>!Control.HasFocus(370) + !Control.HasFocus(333)</visible>
             <include content="Animation_Fade_In">
                 <param name="type">Visible</param>
             </include>
             <include content="Animation_Fade_Out">
                 <param name="type">Hidden</param>
             </include>
             <include content="Furniture_Top">
-                <param name="label">$INFO[Container(300).ListItem.Label]</param>
+                <param name="label">$INFO[Container(370).ListItem.Label]</param>
             </include>
         </control>
-        <control type="list" id="300">
-            <visible allowhiddenfocus="true">Control.HasFocus(300)</visible>
+        <control type="list" id="370">
+            <visible allowhiddenfocus="true">Control.HasFocus(370) | Control.HasFocus(333)</visible>
             <include content="Animation_Fade_In">
                 <param name="type">Visible</param>
             </include>
             <include content="Animation_Fade_Out">
                 <param name="type">Hidden</param>
             </include>
-            <ondown>340</ondown>
+
+            <include content="Action_Widget_Top">
+                <param name="id">370</param>
+            </include>
+            <ondown condition="!Integer.IsEqual(Container(301).NumItems,0)">311</ondown>
+            <ondown condition="Integer.IsEqual(Container(301).NumItems,0) + !Integer.IsEqual(Container(300).NumItems,0)">300</ondown>
+            <ondown condition="Integer.IsEqual(Container(301).NumItems,0) + Integer.IsEqual(Container(300).NumItems,0)">$INFO[Container(370).ListItem.Property(widgets_setfocus)]</ondown>
             <top>20</top>
             <left>120</left>
             <height>200</height>
             <width>440</width>
             <orientation>horizontal</orientation>
             <scrolltime tween="quadratic">400</scrolltime>
             <include content="Home_Menu_List_ItemLayout">
-                <param name="id">300</param>
+                <param name="id">370</param>
                 <param name="hidden_button_enabled">False</param>
                 <param name="itemlayout_w">100</param>
                 <param name="vertical">false</param>
                 <param name="layoutnf">[False]</param>
                 <param name="layoutfo">[True]</param>
             </include>
             <content>
-                <include>skinvariables-$PARAM[categories]-staticitems</include>
+                <include>skinvariables-sidemenu-staticitems</include>
             </content>
         </control>
         <control type="group">
@@ -269,8 +262,8 @@
                 <width>40</width>
                 <left>-40</left>
                 <centertop>50%</centertop>
-                <visible>Container(300).HasPrevious</visible>
-                <visible>Control.HasFocus(300)</visible>
+                <visible>Container(370).HasPrevious</visible>
+                <visible>Control.HasFocus(370)</visible>
                 <include content="Animation_Fade_In">
                     <param name="type">Visible</param>
                 </include>
@@ -284,8 +277,8 @@
                 <width>40</width>
                 <right>-40</right>
                 <centertop>50%</centertop>
-                <visible>Container(300).HasNext</visible>
-                <visible>Control.HasFocus(300)</visible>
+                <visible>Container(370).HasNext</visible>
+                <visible>Control.HasFocus(370)</visible>
                 <include content="Animation_Fade_In">
                     <param name="type">Visible</param>
                 </include>
@@ -314,14 +307,14 @@
     </variable>
 
     <include name="Hub_Standard">
-        <include content="Hub_Menu_Group" condition="!Skin.HasSetting(Hubs.TopBarCategories)">
+        <include content="Hub_Menu_Group">
             <include content="Hub_Submenu_Group">
                 <include>skinvariables-$PARAM[categories]-submenu</include>
             </include>
         </include>
 
-        <include condition="!Skin.HasSetting(Hubs.TopBarCategories) + Window.IsVisible(Home)">skinvariables-sidemenu-spotlight</include>
-        <include condition="!Skin.HasSetting(Hubs.TopBarCategories)">skinvariables-$PARAM[categories]-spotlight</include>
+        <include condition="Window.IsVisible(Home)">skinvariables-sidemenu-spotlight</include>
+        <include>skinvariables-$PARAM[categories]-spotlight</include>
 
         <include content="Hub_Widgets_Group">
             <include>skinvariables-$PARAM[categories]-widgets</include>
@@ -511,14 +504,14 @@
     </include>
 
     <include name="Hub_Widgets_Grouplist__Def_Layout_Expanded">
-        <onup condition="!Skin.HasSetting(Hubs.TopBarCategories)">302</onup>
-        <onup condition="Skin.HasSetting(Hubs.TopBarCategories)">300</onup>
+        <onup>302</onup>
     </include>
 
     <include name="Hub_Widgets_Grouplist__Def_Layout_Basic">
-        <include content="Action_Widget_Top">
+        <include content="Action_Widget_Top" condition="![Window.IsVisible(Home) + Skin.String(Home.SideMenuCollapse,Topbar)]">
             <param name="id">$PARAM[id]</param>
         </include>
+        <onup condition="Window.IsVisible(Home) + Skin.String(Home.SideMenuCollapse,Topbar)">370</onup>
         <!-- <animation effect="slide" end="0,hub_widgets_nocategories_s" condition="true">Conditional</animation> -->
     </include>
 </includes>
diff --git a/1080i/Includes_Items.xml b/1080i/Includes_Items.xml
@@ -229,7 +229,8 @@
                 <label2>$INFO[Skin.String(Home.SideMenuCollapse)]</label2>
                 <onclick condition="Skin.String(Home.SideMenuCollapse,Never)">Skin.SetString(Home.SideMenuCollapse,Library)</onclick>
                 <onclick condition="Skin.String(Home.SideMenuCollapse,Library)">Skin.SetString(Home.SideMenuCollapse,Always)</onclick>
-                <onclick condition="!Skin.String(Home.SideMenuCollapse,Never) + !Skin.String(Home.SideMenuCollapse,Library)">Skin.SetString(Home.SideMenuCollapse,Never)</onclick>
+                <onclick condition="Skin.String(Home.SideMenuCollapse,Always)">Skin.SetString(Home.SideMenuCollapse,Topbar)</onclick>
+                <onclick condition="!Skin.String(Home.SideMenuCollapse,Never) + !Skin.String(Home.SideMenuCollapse,Library) + !Skin.String(Home.SideMenuCollapse,Always)">Skin.SetString(Home.SideMenuCollapse,Never)</onclick>
                 <visible>$PARAM[visible]</visible>
             </include>
             <include content="Settings_Button" description="Expand side menu labels on focus">

diff --git a/1080i/Includes_Spotlight.xml b/1080i/Includes_Spotlight.xml
@@ -187,9 +187,10 @@
                 <control type="grouplist" id="310">
                     <orientation>horizontal</orientation>
 
-                    <include content="Action_Widget_Top">
+                    <include content="Action_Widget_Top" condition="!Skin.String(Home.SideMenuCollapse,Topbar)">
                         <param name="id">311</param>
                     </include>
+                    <onup condition="Skin.String(Home.SideMenuCollapse,Topbar)">370</onup>
 
                     <include content="Action_View_Movement_OnLeftRight" condition="Skin.HasSetting(Spotlight.EnableSpinControl)">
                         <param name="id">311</param>

diff --git a/shortcuts/generator/data/base/category_items.xml b/shortcuts/generator/data/base/category_items.xml
@@ -11,7 +11,7 @@
                 <rules name="parts_visible">
                     <rule>
                         <condition>{item_sidemenu_guid}!=</condition>
-                        <value>String.IsEqual(Container(303).ListItem.Property(guid),{item_sidemenu_guid})</value>
+                        <value>String.IsEqual(Container({sidemenu_id}).ListItem.Property(guid),{item_sidemenu_guid})</value>
                     </rule>
                     <rule>
                         <condition>True</condition>