Skip to content

Commit

Permalink
⚡ Keep spotlight background and logo visible while slideup - Resolves #…
Browse files Browse the repository at this point in the history 
…808
  • Loading branch information
@jurialmunkey
jurialmunkey committed Apr 27, 2024
1 parent 08abfe7 commit 3cf4cbc
Show file tree
Hide file tree
Showing 9 changed files with 110 additions and 74 deletions.
2 changes: 2 additions & 0 deletions 1080i/Home.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,7 @@

<!-- Widget Splash -->
<include>Hub_Widget_Splash</include>

<!-- <include>Overlay_Window_DebugInfo</include> -->
</controls>
</window>
2 changes: 1 addition & 1 deletion 1080i/Includes_Categories.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<include content="Categories_Selector_Movement_Position">
<param name="id">$PARAM[id]</param>
</include>
<width>1250</width>
<width>1240</width>
</include>
<include name="Categories_Selector_Movement_Mainmenu">
<include content="Categories_Selector_Movement_Position">
Expand Down
15 changes: 7 additions & 8 deletions 1080i/Includes_Expressions.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,20 +81,19 @@

<expression name="Exp_Hubs_Spotlight_HasItems">[!Integer.IsEqual(Container(301).NumItems,0) | Container(301).IsUpdating]</expression>

<expression name="Exp_Hubs_SlideDown_Spotlight">[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) + String.IsEmpty(Window.Property(Slide.WidgetContainer)) + !$EXP[Exp_InfoDialogs]]</expression>
<expression name="Exp_Hubs_Spotlight_SlideDown">[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) + String.IsEmpty(Window.Property(Slide.WidgetContainer)) + !$EXP[Exp_InfoDialogs]]</expression>

<expression name="Exp_Hubs_SlideDown_Widgets">[String.IsEmpty(Window.Property(Slide.WidgetContainer)) | $EXP[Exp_Hubs_Categories_HasFocus]]</expression>
<expression name="Exp_Hubs_Widgets_SlideDown">[String.IsEmpty(Window.Property(Slide.WidgetContainer)) | $EXP[Exp_Hubs_Categories_HasFocus] | $EXP[Exp_Hubs_Submenu_HasFocus]]</expression>

<!-- <expression name="Exp_Hubs_SlideDown_Categories">[String.IsEmpty(Window.Property(Slide.WidgetContainer))]</expression> -->
<expression name="Exp_Hubs_SlideDown_Categories">[String.IsEmpty(Window.Property(Slide.WidgetContainer)) + !$EXP[Exp_Hubs_Spotlight_IsDisabled]]</expression>
<expression name="Exp_Hubs_Categories_SlideDown">[[String.IsEmpty(Window.Property(Slide.WidgetContainer))] + !$EXP[Exp_Hubs_Spotlight_IsDisabled]]</expression>
<!-- <expression name="Exp_Hubs_Categories_SlideDown">[[String.IsEmpty(Window.Property(Slide.WidgetContainer)) | [$EXP[Exp_Hubs_Categories_HasFocus] + $EXP[Exp_Hubs_Spotlight_IsFanart]]] + !$EXP[Exp_Hubs_Spotlight_IsDisabled]]</expression> -->

<expression name="Exp_Hubs_Categories_HasFocus">[Integer.IsEqual(Window.Property(Slide.WidgetContainer),300) | Integer.IsEqual(Window.Property(Slide.WidgetContainer),302) | Control.HasFocus(300) | Control.HasFocus(302)]</expression>
<expression name="Exp_Hubs_Categories_IsSlide">[$EXP[Exp_Window_IsHub] + $EXP[Exp_Hubs_Spotlight_IsSlide] + [$EXP[Exp_Hubs_Categories_HasFocus] | [Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) + $EXP[Exp_Hubs_Spotlight_IsDisabled]]]]</expression>
<expression name="Exp_Hubs_Categories_HasFocus">[Integer.IsEqual(Window.Property(Slide.WidgetContainer),300) | Control.HasFocus(300)]</expression>
<expression name="Exp_Hubs_Submenu_HasFocus">[Integer.IsEqual(Window.Property(Slide.WidgetContainer),302) | Control.HasFocus(302)]</expression>

<expression name="Exp_Hubs_Spotlight_IsDisabled">[Skin.HasSetting(Background.DisableSpotlight)]</expression>
<expression name="Exp_Hubs_Spotlight_IsFanart">[!$EXP[Exp_Hubs_Spotlight_IsDisabled] + Skin.HasSetting(Background.EnableSpotlightFanart)]</expression>
<expression name="Exp_Hubs_Spotlight_IsSlide">[[!$EXP[Exp_Hubs_Spotlight_IsDisabled] + Skin.HasSetting(Background.EnableSpotlightSlide)] | $EXP[Exp_Hubs_Spotlight_IsFanart] | $EXP[Exp_Hubs_Spotlight_IsDisabled]]</expression>
<expression name="Exp_Hubs_Spotlight_IsStatic">[Skin.HasSetting(Background.DisableSpotlight) | Skin.HasSetting(Background.EnableSpotlightFanart)]</expression>
<expression name="Exp_Hubs_Spotlight_IsMini">[False]</expression>

<!-- ============== -->
Expand Down Expand Up @@ -124,7 +123,7 @@

<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_BackgroundArtwork_IsHidden">[$EXP[Exp_FilterWall_IsActive] | Window.IsVisible(favouritesbrowser) | $EXP[Exp_Hubs_Categories_IsSlide]]</expression>
<expression name="Exp_BackgroundArtwork_IsHidden">[$EXP[Exp_FilterWall_IsActive] | Window.IsVisible(favouritesbrowser)]</expression>

<expression name="Exp_MediaFilter_IsActive">[!String.IsEmpty(Window.Property(MediaFilterBase))]</expression>

Expand Down
81 changes: 42 additions & 39 deletions 1080i/Includes_Hubs.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,38 @@

<!-- SlideUp Categories = Disabled -->
<include name="Hub_Slide_Group_OnCategories">
<animation effect="slide" time="400" end="0" start="0,hub_group_widgetup_s" tween="quadratic" easing="out" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">Conditional</animation>
<animation effect="slide" time="400" end="0,hub_group_widgetup_s" start="0" tween="quadratic" easing="out" reversible="false" condition="!$EXP[Exp_Hubs_SlideDown_Categories]">Conditional</animation>
<animation effect="slide" time="400" end="0" start="0,hub_group_widgetup_s" tween="quadratic" easing="out" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
<animation effect="slide" time="400" end="0,hub_group_widgetup_s" start="0" tween="quadratic" easing="out" reversible="false" condition="!$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
</include>
<include name="Hub_WindowTransition_Group_OnCategories">
<animation effect="slide" start="0" end="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">WindowClose</animation>
<animation effect="slide" end="0" start="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">WindowOpen</animation>
<animation effect="slide" start="0" end="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">WindowClose</animation>
<animation effect="slide" end="0" start="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">WindowOpen</animation>
</include>
<include name="Hub_WindowTransition_CategoriesSpotlight_OnCategories">
<animation effect="fade" start="100" end="0" time="200" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">WindowClose</animation>
<animation effect="fade" end="100" start="0" time="400" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="200" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">WindowClose</animation>
<animation effect="fade" end="100" start="0" time="400" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">WindowOpen</animation>
</include>

<!-- SlideUp Categories = Enabled -->
<include name="Hub_Slide_Group_OnWidgets">
<animation effect="slide" time="400" end="0" start="0,hub_group_widgetup_s" tween="quadratic" easing="out" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Widgets]">Conditional</animation>
<animation effect="slide" time="400" end="0,hub_group_widgetup_s" start="0" tween="quadratic" easing="out" reversible="false" condition="!$EXP[Exp_Hubs_SlideDown_Widgets]">Conditional</animation>
<animation effect="slide" time="400" end="0" start="0,hub_group_widgetup_s" tween="quadratic" easing="out" reversible="false" condition="$EXP[Exp_Hubs_Widgets_SlideDown]">Conditional</animation>
<animation effect="slide" time="400" end="0,hub_group_widgetup_s" start="0" tween="quadratic" easing="out" reversible="false" condition="!$EXP[Exp_Hubs_Widgets_SlideDown]">Conditional</animation>
</include>
<include name="Hub_WindowTransition_Group_OnWidgets">
<animation effect="slide" start="0" end="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Widgets]">WindowClose</animation>
<animation effect="slide" end="0" start="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Widgets]">WindowOpen</animation>
<animation effect="slide" start="0" end="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Widgets_SlideDown]">WindowClose</animation>
<animation effect="slide" end="0" start="0,hub_group_widgetup_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Widgets_SlideDown]">WindowOpen</animation>
</include>
<include name="Hub_WindowTransition_CategoriesSpotlight_OnWidgets">
<animation effect="fade" start="100" end="0" time="200" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Widgets]">WindowClose</animation>
<animation effect="fade" end="100" start="0" time="400" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Widgets]">WindowOpen</animation>
<animation effect="fade" start="100" end="0" time="200" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_Widgets_SlideDown]">WindowClose</animation>
<animation effect="fade" end="100" start="0" time="400" tween="sine" easing="in" reversible="false" condition="$EXP[Exp_Hubs_Widgets_SlideDown]">WindowOpen</animation>
</include>

<!-- Fanart Spotlight = Enabled -->
<include name="Hub_Slide_Spotlight_OnFanart">
<animation effect="slide" start="0" end="0,hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Spotlight]">Conditional</animation>
<animation effect="slide" end="0" start="0,hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="!$EXP[Exp_Hubs_SlideDown_Spotlight]">Conditional</animation>
<animation effect="slide" start="0" end="0,-hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Spotlight]">WindowClose</animation>
<animation effect="slide" end="0" start="0,-hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Spotlight]">WindowOpen</animation>
<animation effect="slide" start="0" end="0,hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Spotlight_SlideDown]">Conditional</animation>
<animation effect="slide" end="0" start="0,hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="!$EXP[Exp_Hubs_Spotlight_SlideDown]">Conditional</animation>
<animation effect="slide" start="0" end="0,-hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Spotlight_SlideDown]">WindowClose</animation>
<animation effect="slide" end="0" start="0,-hub_group_fanartspotlight_s" time="400" tween="quadratic" reversible="false" condition="$EXP[Exp_Hubs_Spotlight_SlideDown]">WindowOpen</animation>
</include>

<variable name="Hub_Submenu_Highlight">
Expand Down Expand Up @@ -73,12 +73,12 @@

<include name="Hub_Categories_Spotlight_Slide_Animation">
<top>$PARAM[top]</top>
<animation effect="slide" start="0" end="0,$PARAM[y]" reversible="false" time="400" tween="quadratic" condition="$EXP[Exp_Hubs_Spotlight_IsVisible]">Conditional</animation>
<animation effect="slide" start="0,$PARAM[y]" end="0" reversible="false" time="400" tween="quadratic" condition="!$EXP[Exp_Hubs_Spotlight_IsVisible]">Conditional</animation>
<animation effect="slide" start="0" end="0,$PARAM[y]" reversible="false" time="400" tween="quadratic" condition="$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
<animation effect="slide" start="0,$PARAM[y]" end="0" reversible="false" time="400" tween="quadratic" condition="!$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
</include>
<include name="Hub_Categories_Spotlight_Slide">
<top>$PARAM[top]</top>
<include content="Hub_Categories_Spotlight_Slide_Animation" condition="!$EXP[Exp_Hubs_Spotlight_IsStatic]">
<include content="Hub_Categories_Spotlight_Slide_Animation" condition="!$EXP[Exp_Hubs_Spotlight_IsDisabled]">
<param name="y">$PARAM[y]</param>
</include>
</include>
Expand Down Expand Up @@ -106,6 +106,7 @@
<param name="ondown">$PARAM[ondown]</param>
<param name="id">$PARAM[id]</param>
</include>
<movement>1</movement>
<left>-20</left>
<include content="Hub_Categories_Spotlight_Slide" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="top">40</param>
Expand Down Expand Up @@ -134,9 +135,13 @@
<param name="id">$PARAM[id]</param>
</include>
<include content="Hub_Categories_Spotlight_Slide" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="top">80</param>
<param name="y">-40</param>
<param name="top">100</param>
<param name="y">-60</param>
</include>
<include content="Object_Width" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="width">760</param>
</include>
<movement>2</movement>
<top>40</top>
<nested />
</include>
Expand Down Expand Up @@ -209,7 +214,7 @@
</include>
<animation effect="fade" start="0" end="100" time="background_fadetime" delay="background_fadetime">Visible</animation>
<animation effect="fade" start="100" end="0" time="background_fadetime" delay="background_fadetime">Hidden</animation>
<visible>$EXP[Exp_Hubs_SlideDown_Spotlight]</visible>
<visible>$EXP[Exp_Hubs_Spotlight_SlideDown]</visible>
</control>
</include>

Expand Down Expand Up @@ -524,7 +529,7 @@
<param name="window_id">$PARAM[window_id]</param>
<param name="categories">$PARAM[categories]</param>
</include>
<movement>2</movement>
<movement>1</movement>
<width>1095</width>
<left>-20</left>
<include content="Hub_Categories_Spotlight_Slide" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
Expand All @@ -548,9 +553,16 @@
<param name="categories">$PARAM[categories]</param>
</include>
<include content="Hub_Categories_Spotlight_Slide" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="top">100</param>
<param name="y">-40</param>
<param name="top">120</param>
<param name="y">-60</param>
</include>
<include content="Object_Width" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="width">760</param>
</include>
<include content="Object_Movement" condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">
<param name="movement">1</param>
</include>
<movement>2</movement>
<top>60</top>
</include>
</include>
Expand Down Expand Up @@ -582,15 +594,8 @@
<control type="group">
<top>-20</top>
<left>40</left>
<animation effect="fade" start="100" end="0" reversible="false" condition="$EXP[Exp_Hubs_SlideDown_Categories]">Conditional</animation>
<animation effect="fade" start="0" end="100" delay="399" time="1" reversible="false" condition="!$EXP[Exp_Hubs_SlideDown_Categories]">Conditional</animation>
<!-- <include content="Animation_Fade_In" condition="!$EXP[Exp_Hubs_Spotlight_IsFanart]">
<param name="condition">!$EXP[Exp_Hubs_SlideDown_Categories]</param>
<param name="delay">200</param>
</include>
<include content="Animation_ConditionalFade">
<param name="condition">$EXP[Exp_Hubs_SlideDown_Categories]</param>
</include> -->
<animation effect="fade" start="100" end="0" reversible="false" condition="$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
<animation effect="fade" start="0" end="100" delay="399" time="1" reversible="false" condition="!$EXP[Exp_Hubs_Categories_SlideDown]">Conditional</animation>
<include content="Info_Title_LogoLabel">
<param name="label">$INFO[Container(303).ListItem.Label]</param>
<param name="wrapmultiline">false</param>
Expand All @@ -617,7 +622,7 @@
<left>160</left>
<height>hub_categorieswidget_h</height>
<top>hub_categorieswidget_t</top>
<include condition="$EXP[Exp_Hubs_Spotlight_IsSlide]">Hub_Categories_Header</include>
<include condition="$EXP[Exp_Hubs_Spotlight_IsDisabled]">Hub_Categories_Header</include>
<include content="Hub_Categories_Definition">
<param name="window_id">$PARAM[window_id]</param>
<param name="categories">$PARAM[categories]</param>
Expand All @@ -629,16 +634,14 @@

<include name="Hub_Categories_FadeIn">
<definition>

<include content="Animation_Fade_In">
<param name="condition">[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) | $EXP[Exp_Hubs_Categories_HasFocus]]</param>
<param name="condition">[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) | $EXP[Exp_Hubs_Categories_HasFocus] | $EXP[Exp_Hubs_Submenu_HasFocus]]</param>
<param name="delay">0</param>
</include>
<include content="Animation_ConditionalFade">
<param name="condition">![[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) | $EXP[Exp_Hubs_Categories_HasFocus]]]</param>
<param name="condition">![[Integer.IsEqual(Window.Property(TMDBHelper.WidgetContainer),301) | $EXP[Exp_Hubs_Categories_HasFocus] | $EXP[Exp_Hubs_Submenu_HasFocus]]]</param>
</include>
</definition>

</include>

<include name="Hub_Widgets_Grouplist_Animation_Slide">
Expand Down
4 changes: 2 additions & 2 deletions 1080i/Includes_Info.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<width>$PARAM[width]</width>
<height>$PARAM[height]</height>
<control type="group">
<centertop>30</centertop>
<centertop>25</centertop>
<height>40</height>
<!-- <control type="image">
<height>40</height>
Expand Down Expand Up @@ -70,7 +70,7 @@
<control type="label">
<wrapmultiline>$PARAM[wrapmultiline]</wrapmultiline>
<height>84</height>
<bottom>0</bottom>
<bottom>5</bottom>
<aligny>center</aligny>
<label>$PARAM[label]</label>
<textcolor>$PARAM[colordiffuse]_100</textcolor>
Expand Down
Loading

0 comments on commit 3cf4cbc

Please sign in to comment.