Skip to content
This repository has been archived by the owner on Nov 7, 2024. It is now read-only.

Commit

Permalink
⚡ Consolidate movements further
Browse files Browse the repository at this point in the history
  • Loading branch information
@jurialmunkey
jurialmunkey committed Dec 24, 2023
1 parent de1cba8 commit b5298d1
Show file tree
Hide file tree
Showing 9 changed files with 165 additions and 138 deletions.
24 changes: 11 additions & 13 deletions 1080i/Includes_Actions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
<include name="Action_Media_Onload">
<onload>RunScript(script.skinvariables,action=buildviews)</onload>
<onload>ClearProperty(MediaFilterBase)</onload>
<onload>ClearProperty(View.WallSwitchPosition)</onload>
<onunload>ClearProperty(MediaFilterBase)</onunload>
<onunload>ClearProperty(View.WallSwitchPosition)</onunload>
</include>

<variable name="Action_OSD_Main_OnDown">
Expand Down Expand Up @@ -144,7 +142,7 @@
<ondown condition="$PARAM[condition]">Control.Move(303,1)</ondown>

<!-- Go to Recs -->
<include content="Action_Info_Recommendations_OnDown">
<include content="Action_View_Explore_OnDown">
<param name="condition">[![$PARAM[condition]] + $PARAM[bump] + Skin.String(Navigation.OnDown,Explore)]</param>
</include>

Expand Down Expand Up @@ -299,7 +297,7 @@
<onclick>SetFocus(4000)</onclick>
</include>

<include name="Action_Info_Recommendations_OnDown">
<include name="Action_View_Explore_OnDown">
<param name="condition">True</param>
<definition>
<ondown condition="$PARAM[condition] + [String.IsEqual(ListItem.DBType,movie) | String.IsEqual(ListItem.DBType,tvshow) | String.IsEqual(ListItem.DBType,set) | String.IsEqual(ListItem.DBType,season) | String.IsEqual(ListItem.DBType,episode)]">SetProperty(Item_Title,$VAR[Label_Title_Container],1181)</ondown>
Expand All @@ -325,9 +323,9 @@
</include>

<include name="Action_View_Movement_OnDown">
<include condition="Skin.String(Navigation.OnDown,Recommendations)">Action_Info_Recommendations_OnDown</include>
<ondown condition="!Skin.String(Navigation.OnDown,Recommendations)">SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]])</ondown>
<ondown condition="!Skin.String(Navigation.OnDown,Recommendations)">330</ondown>
<include condition="Skin.String(Navigation.OnDown,Explore)">Action_View_Explore_OnDown</include>
<ondown condition="!Skin.String(Navigation.OnDown,Explore)">SetProperty(List.ViewContainer,$NUMBER[$PARAM[id]])</ondown>
<ondown condition="!Skin.String(Navigation.OnDown,Explore)">330</ondown>
</include>

<include name="Action_View_Movement_OnBack">
Expand Down Expand Up @@ -444,20 +442,20 @@
</include>

<include name="Action_Scrollbar">
<onup condition="!String.IsEmpty(Window.Property(View.WallSwitchPosition))">9600</onup>
<onup condition="String.IsEmpty(Window.Property(View.WallSwitchPosition))">SetFocus(68)</onup>
<onup condition="!Skin.HasSetting(Navigation.MediaFilterWall)">9600</onup>
<onup condition="Skin.HasSetting(Navigation.MediaFilterWall)">SetFocus(19)</onup>
<onback>68</onback>
<onclick>SetFocus(68)</onclick>
<ondown>SetFocus(68)</ondown>
</include>

<variable name="Action_Var_ToMediaFilter">
<value>Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideIn,focus_id=64,clear_prop_one=Null,clear_prop_two=Null,preaction=SetProperty(View.WallSwitchPosition,1))</value>
<value condition="$EXP[Exp_FilterWall_IsViewtype] + Skin.HasSetting(Navigation.MediaFilterWall)">Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideIn,focus_id=64,clear_prop_one=Null,clear_prop_two=Null)</value>
<value condition="$EXP[Exp_FilterWall_IsViewtype]">Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=64,clear_prop_one=Null,clear_prop_two=Null)</value>
<value condition="!Skin.HasSetting(Navigation.MediaFilterWall)">Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=9501,clear_prop_one=Null,clear_prop_two=Null)</value>
<value>Runscript(script.skinvariables,"run_executebuiltin=special://skin/shortcuts/builtins/skinvariables-mediafilter-setfocus.json",use_rules,id=$VAR[Action_View_ContentID],focus_id=9001,clear_prop_one=Null,clear_prop_two=Null)</value>
</variable>

<variable name="Action_Var_ToMediaWall">
<value>Runscript(script.skinvariables,$VAR[MediaWall_ScriptTypeDef],use_rules,id=$VAR[Action_View_ContentID],win_prop=WallSlideIn,focus_id=64,clear_prop_one=Null,clear_prop_two=Null,preaction=ClearProperty(View.WallSwitchPosition))</value>
</variable>

<include name="_Action_Blur_Onload">
<param name="sourceimage">Art(fanart)</param>
Expand Down
10 changes: 5 additions & 5 deletions 1080i/Includes_Expressions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,19 @@


<!-- Discover Wall -->
<expression name="Exp_FilterWall_IsDiscover">[Control.IsVisible(55) + !Integer.IsEqual(Container(553).NumItems,0) + !Skin.HasSetting(DisableMediaFilterWall)]</expression>
<expression name="Exp_FilterWall_IsDiscover">[Control.IsVisible(55) + !Integer.IsEqual(Container(553).NumItems,0) + Skin.HasSetting(Navigation.MediaFilterWall)]</expression>

<!-- Media Filter Wall -->
<expression name="Exp_FilterWall_IsMedia">[!String.IsEmpty(Window.Property(MediaFilterBase)) + $EXP[Exp_FilterWall_IsEnabled] + $EXP[Exp_FilterWall_IsViewtype]]</expression>

<!-- Media Filter Has -->
<expression name="Exp_FilterWall_IsEnabled">[Window.IsMedia + !Skin.HasSetting(DisableMediaFilterWall)]</expression>
<expression name="Exp_FilterWall_IsViewtype">[Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | Control.IsVisible(502) | Control.IsVisible(512) | Control.IsVisible(522)]</expression>
<expression name="Exp_FilterWall_IsEnabled">[Window.IsMedia + Skin.HasSetting(Navigation.MediaFilterWall)]</expression>
<expression name="Exp_FilterWall_IsViewtype">[Control.IsVisible(50) | Control.IsVisible(51) | Control.IsVisible(52) | [[Control.IsVisible(502) | Control.IsVisible(512) | Control.IsVisible(522)] + !Skin.HasSetting(Views.UseAltCombined)]]</expression>


<expression name="Exp_MediaFilterVisible">[!String.IsEmpty(Window.Property(MediaFilterBase)) + !String.IsEmpty(Window.Property(View.WallSwitchPosition))]</expression>
<expression name="Exp_MediaFilterVisible">[!String.IsEmpty(Window.Property(MediaFilterBase)) + !Skin.HasSetting(Navigation.MediaFilterWall)]</expression>

<expression name="Exp_Hide_BackgroundArt">[$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover] | $EXP[Exp_MediaFilterVisible] | [Window.IsVisible(1105) + !$EXP[Exp_Search_WidgetGroup_HasFocus]]]</expression>
<expression name="Exp_Hide_BackgroundArt">[$EXP[Exp_FilterWall_IsMedia] | $EXP[Exp_FilterWall_IsDiscover] | !String.IsEmpty(Window.Property(MediaFilterBase)) | [Window.IsVisible(1105) + !$EXP[Exp_Search_WidgetGroup_HasFocus]]]</expression>


<!-- ================= -->
Expand Down
104 changes: 53 additions & 51 deletions 1080i/Includes_MediaFilter.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,66 +308,65 @@
</include>
</include>

<include name="MediaFilter_Node_Alphabet">
<control type="group">
<top>140</top>
<left>160</left>
<width>720</width>
<include content="Search_Filter_Alphabet">
<param name="rowone">9002</param>
<param name="rowtwo">9003</param>
<param name="editid">19</param>
<param name="ondown">9500</param>
<param name="onback">68</param>
</include>
</control>
</include>

<include name="MediaFilter_Node">

<control type="group">
<visible>!$EXP[Exp_InfoDialogs]</visible>
<visible>$EXP[Exp_MediaFilterVisible]</visible>
<visible>!String.IsEmpty(Window.Property(MediaFilterBase)) + [!$EXP[Exp_ScrollbarVisible_H] | !Skin.HasSetting(Navigation.MediaFilterWall)]</visible>
<include content="Animation_Fade_In">
<param name="delay">0</param>
<param name="type">Visible</param>
</include>

<!-- Top Row -->
<control type="group">
<left>160</left>
<width>720</width>
<!-- Top Row -->
<control type="group">
<centertop>100</centertop>
<centertop>100</centertop>
<height>view_pad</height>
<include content="Object_Hidden_Button">
<param name="id">9001</param>
<include>MediaFilter_Node_ClearAll</include>
<onfocus>SetFocus(19)</onfocus>
</include>
<!-- Edit Control -->
<control type="edit" id="19">
<description>Filter</description>
<font>font_midi_black</font>
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<disabledcolor>00ffffff</disabledcolor>
<focusedcolor>$VAR[ColorSelected]</focusedcolor>
<height>view_pad</height>
<include content="Object_Hidden_Button">
<param name="id">9001</param>
<include>MediaFilter_Node_ClearAll</include>

<onfocus>SetProperty(View.WallSwitchPosition,1)</onfocus>
<onfocus>SetFocus(19)</onfocus>
<textoffsetx>40</textoffsetx>
<align>left</align>
<onup>SetProperty(List.ViewContainer,19)</onup>
<onup>333</onup>
<ondown condition="!Skin.HasSetting(Navigation.MediaFilterWall)">9002</ondown>
<ondown condition="Skin.HasSetting(Navigation.MediaFilterWall)">64</ondown>
<onright>9004</onright>
<include content="Action_View_Movement_OnLeft" condition="$EXP[Exp_HomeMenu_DontHide]">
<param name="id">19</param>
<param name="onleft">9009</param>
<param name="menuid">308</param>
</include>
<!-- Edit Control -->
<control type="edit" id="19">
<description>Filter</description>
<font>font_midi_black</font>
<textcolor>00ffffff</textcolor>
<selectedcolor>00ffffff</selectedcolor>
<disabledcolor>00ffffff</disabledcolor>
<focusedcolor>$VAR[ColorSelected]</focusedcolor>
<height>view_pad</height>
<textoffsetx>40</textoffsetx>
<align>left</align>
<onup>SetProperty(List.ViewContainer,19)</onup>
<onup>333</onup>
<ondown>9002</ondown>
<onright>9004</onright>
<include content="Action_View_Movement_OnLeft" condition="$EXP[Exp_HomeMenu_DontHide]">
<param name="id">19</param>
<param name="onleft">9009</param>
<param name="menuid">308</param>
</include>
<include content="Action_View_Movement_OnLeft" condition="![$EXP[Exp_HomeMenu_DontHide]]">
<param name="id">19</param>
<param name="onleft">9009</param>
</include>
</control>
</control>
<!-- Alphabet and Autocomplete -->
<control type="group">
<top>140</top>
<left>0</left>
<include content="Search_Filter_Alphabet">
<param name="rowone">9002</param>
<param name="rowtwo">9003</param>
<param name="editid">19</param>
<param name="ondown">9500</param>
<param name="onback">68</param>
<include content="Action_View_Movement_OnLeft" condition="![$EXP[Exp_HomeMenu_DontHide]]">
<param name="id">19</param>
<param name="onleft">9009</param>
</include>
</control>
</control>
Expand All @@ -378,11 +377,12 @@
<orientation>horizontal</orientation>
<height>160</height>
<right>-20</right>
<onleft>SetFocus(9001)</onleft>
<onleft>SetFocus(19)</onleft>
<onback>68</onback>
<onup>SetProperty(List.ViewContainer,9000)</onup>
<onup>333</onup>
<ondown>SetFocus(68)</ondown>
<ondown condition="!Skin.HasSetting(Navigation.MediaFilterWall)">9002</ondown>
<ondown condition="Skin.HasSetting(Navigation.MediaFilterWall)">68</ondown>

<include content="Action_View_Movement_OnRight" condition="$EXP[Exp_HomeMenu_DontHide]">
<param name="id">19</param>
Expand Down Expand Up @@ -475,9 +475,11 @@
<onclick>Runscript(script.skinvariables,action=buildviews,contentid=$VAR[Items_ViewMode_Switch],pluginname=$INFO[Container.PluginName])</onclick>
</include>
</control>
<include>MediaFilter_Node_Filters</include>

<include condition="!Skin.HasSetting(Navigation.MediaFilterWall)">MediaFilter_Node_Alphabet</include>
<include condition="!Skin.HasSetting(Navigation.MediaFilterWall)">MediaFilter_Node_Filters</include>
</control>
<include>MediaFilter_Node_Dialog</include>
<include condition="!Skin.HasSetting(Navigation.MediaFilterWall)">MediaFilter_Node_Dialog</include>
</include>

<include name="MediaFilter_Discover_Node">
Expand Down
2 changes: 1 addition & 1 deletion 1080i/Includes_MediaWall.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,7 @@
</include>

<include name="MediaWall_Discover">
<include content="MediaWall" condition="!Skin.HasSetting(DisableMediaFilterWall)">
<include content="MediaWall" condition="Skin.HasSetting(Navigation.MediaFilterWall)">
<param name="id">553</param>
<param name="visible">$EXP[Exp_FilterWall_IsDiscover]</param>
<param name="interchange_condition">[!Container(553).IsUpdating]</param>
Expand Down
Loading

0 comments on commit b5298d1

Please sign in to comment.