possible fix for settings menu bug - #65

jurialmunkey · Jun 6, 2022 · 36b86bd · 36b86bd
1 parent 9d14603
commit 36b86bd
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 3 deletions.
diff --git a/1080i/DialogButtonMenu.xml b/1080i/DialogButtonMenu.xml
@@ -6,6 +6,7 @@
         <include content="Object_Options_Menu">
             <param name="grouplist_items" value="skinshortcuts-template-powermenu" />
             <param name="isbuttonmenu" value="true" />
+            <param name="isfocused" value="true" />
             <param name="action_include" value="Action_OptionsMenu_ButtonMenu" />
         </include>
 

diff --git a/1080i/Home.xml b/1080i/Home.xml
@@ -121,13 +121,17 @@
             <animation effect="fade" start="100" end="0" condition="Window.Next(1114)">Conditional</animation>
             <include content="Object_Hidden_Button">
                 <param name="id" value="399" />
+
                 <onleft condition="String.IsEmpty(Container(300).ListItemNoWrap(-1).Label)">ClearProperty(AnimationDirection)</onleft>
                 <onleft condition="String.IsEmpty(Container(300).ListItemNoWrap(-1).Label)">ActivateWindow(1114)</onleft>
                 <onleft condition="!String.IsEmpty(Container(300).ListItemNoWrap(-1).Label)">SetProperty(AnimationDirection,Left)</onleft>
                 <onleft condition="!String.IsEmpty(Container(300).ListItemNoWrap(-1).Label)">Control.Move(300,-1)</onleft>
+
+                <onright condition="String.IsEmpty(Container(300).ListItemNoWrap(1).Label)">SetProperty(OptionsMenuFocused,303,Home)</onright>
                 <onright condition="String.IsEmpty(Container(300).ListItemNoWrap(1).Label)">SetFocus(303)</onright>
                 <onright condition="!String.IsEmpty(Container(300).ListItemNoWrap(1).Label)">SetProperty(AnimationDirection,Right)</onright>
                 <onright condition="!String.IsEmpty(Container(300).ListItemNoWrap(1).Label)">Control.Move(300,1)</onright>
+                <onfocus>ClearProperty(OptionsMenuFocused,Home)</onfocus>
                 <onfocus>SetProperty(TMDbHelper.WidgetContainer,301,Home)</onfocus>
                 <onup>SetFocus(302,0,absolute)</onup>
                 <oninfo>SetFocus(302,0,absolute)</oninfo>
@@ -152,8 +156,13 @@
                 <onfocus condition="String.IsEmpty(Window.Property(MenuSelect))">SetProperty(TMDbHelper.WidgetContainer,301,Home)</onfocus>
                 <left>80</left>
                 <include>skinshortcuts-template-menubar</include>
+                <onfocus>ClearProperty(OptionsMenuFocused,Home)</onfocus>
                 <onup>SetFocus(302,0,absolute)</onup>
                 <oninfo>SetFocus(302,0,absolute)</oninfo>
+                <onright>SetProperty(OptionsMenuFocused,303,Home)</onright>
+                <onright>SetFocus(303)</onright>
+                <onleft>ClearProperty(AnimationDirection)</onleft>
+                <onleft>ActivateWindow(1114)</onleft>
                 <content><include>skinshortcuts-mainmenu</include></content>
             </include>
         </include>
@@ -204,10 +213,28 @@
         <include content="Object_Options_Menu">
             <param name="grouplist_items" value="skinshortcuts-template-powermenu" />
             <param name="visible" value="!Window.IsVisible(DialogSelect.xml) + !Window.IsVisible(favourites)" />
+            <param name="isfocused" value="!String.IsEmpty(Window(Home).Property(OptionsMenuFocused))" />
             <param name="onback" value="300" />
             <param name="id" value="303" />
         </include>
 
+        <control type="button" id="360">
+            <right>80</right>
+            <centertop>100</centertop>
+            <width>60</width>
+            <height>60</height>
+            <visible allowhiddenfocus="true">false</visible>
+            <onleft>399</onleft>
+            <onright>399</onright>
+            <onup>399</onup>
+            <ondown>399</ondown>
+            <onclick condition="!String.IsEmpty(Window(Home).Property(OptionsMenuFocused))">ClearProperty(OptionsMenuFocused,Home)</onclick>
+            <onclick condition="!String.IsEmpty(Window(Home).Property(OptionsMenuFocused))">SetFocus(399)</onclick>
+            <onclick condition="String.IsEmpty(Window(Home).Property(OptionsMenuFocused))">SetProperty(OptionsMenuFocused,303,Home)</onclick>
+            <onclick condition="String.IsEmpty(Window(Home).Property(OptionsMenuFocused))">SetFocus(303)</onclick>
+            <!-- <onclick>ActivateWindow(shutdownmenu)</onclick> -->
+        </control>
+
 
     </controls>
 </window>
diff --git a/1080i/IDs b/1080i/IDs
@@ -30,6 +30,7 @@ HOME
 303     Sidemenu
 320     Group
 330     Bumper
+360     Settings Button
 399     Menu Control
 
 XX400   Grouplist for Menu ID

diff --git a/1080i/Objects.xml b/1080i/Objects.xml
@@ -780,6 +780,7 @@
         <param name="visible" default="true" />
         <param name="iscontextmenu" default="false" />
         <param name="isbuttonmenu" default="false" />
+        <param name="isfocused" default="false" />
         <param name="useanimation" default="true" />
         <param name="nib_pos" default="70" />
         <param name="wraparound" default="true" />
@@ -873,7 +874,7 @@
                     <include>Animation_SlideIn_Dialog</include>
                     <include condition="!$PARAM[isbuttonmenu]">Animation_FadeOut</include>
                     <visible>$PARAM[visible]</visible>
-                    <visible>[ControlGroup($PARAM[id]).HasFocus() + $PARAM[usegrouplist]] | [Control.HasFocus($PARAM[id]) + !$PARAM[usegrouplist]]</visible>
+                    <visible>[ControlGroup($PARAM[id]).HasFocus() + $PARAM[usegrouplist]] | [Control.HasFocus($PARAM[id]) + !$PARAM[usegrouplist]] | $PARAM[isfocused]</visible>
                 </include>
                 <width>$PARAM[width]</width>
                 <height>860</height>
@@ -893,11 +894,12 @@
         <param name="visible" default="true" />
         <param name="iscontextmenu" default="false" />
         <param name="isbuttonmenu" default="false" />
+        <param name="isfocused" default="false" />
         <param name="hasbuttonoverlay" default="true" />
         <definition>
             <include content="Object_Control">
                 <param name="control" value="group" />
-                <visible>[ControlGroup($PARAM[id]).HasFocus() + $PARAM[usegrouplist]] | [Control.HasFocus($PARAM[id]) + !$PARAM[usegrouplist]]</visible>
+                <visible>[ControlGroup($PARAM[id]).HasFocus() + $PARAM[usegrouplist]] | [Control.HasFocus($PARAM[id]) + !$PARAM[usegrouplist]] | $PARAM[isfocused]</visible>
                 <include>Animation_FadeIn</include>
                 <include condition="!$PARAM[isbuttonmenu]">Animation_FadeOut</include>
                 <include content="Object_Overlay">
@@ -925,6 +927,7 @@
                 <param name="visible" value="$PARAM[visible]" />
                 <param name="iscontextmenu" value="$PARAM[iscontextmenu]" />
                 <param name="isbuttonmenu" value="$PARAM[isbuttonmenu]" />
+                <param name="isfocused" value="$PARAM[isfocused]" />
                 <param name="grouplist_items" value="$PARAM[grouplist_items]" />
                 <param name="nib_pos" value="$PARAM[nib_pos]" />
                 <param name="useanimation" value="$PARAM[useanimation]" />

diff --git a/addon.xml b/addon.xml
@@ -1,4 +1,4 @@
-<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.6">
+<addon id="skin.arctic.horizon.2" name="Arctic Horizon 2" provider-name="jurialmunkey" version="0.1.7">
     <requires>
         <import addon="xbmc.gui" version="5.15.0" />
         <import addon="script.skinshortcuts" version="0.4.0" />