Skip to content

Commit

Permalink
zeror transitions wip
Browse files Browse the repository at this point in the history
  • Loading branch information
@realcopacetic
realcopacetic committed Jul 2, 2024
1 parent e3fd8fd commit 5918364
Show file tree
Hide file tree
Showing 29 changed files with 230 additions and 191 deletions.
115 changes: 55 additions & 60 deletions 16x9/Animations.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
<param name="reversible" default="false" />
<param name="disable_delay_on_quick" default="false" />
<definition>
<include content="fade_$PARAM[type]" condition="!Skin.HasSetting(Experiment_Disable_Transitions)">
<include content="fade_$PARAM[type]" condition="!Skin.HasSetting(Quick_Transitions)">
<param name="time" value="Default_Transition_$PARAM[time]" />
<param name="delay" value="Default_Transition_$PARAM[delay]" />
<param name="condition" value="$PARAM[condition]" />
<param name="reversible" value="$PARAM[reversible]" />
</include>
<include content="fade_$PARAM[type]" condition="Skin.HasSetting(Experiment_Disable_Transitions)">
<include content="fade_$PARAM[type]" condition="Skin.HasSetting(Quick_Transitions)">
<param name="time" value="Quick_Transition_$PARAM[time]" />
<param name="delay" value="Quick_Transition_$PARAM[quick_delay]" />
<param name="condition" value="$PARAM[condition]" />
Expand All @@ -50,7 +50,7 @@
<param name="condition" default="true" />
<param name="reversible" default="true" />
<definition>
<include content="fadediffuse_template" condition="!Skin.HasSetting(Experiment_Disable_Transitions)">
<include content="fadediffuse_template" condition="!Skin.HasSetting(Quick_Transitions)">
<param name="type" value="$PARAM[type]" />
<param name="start" value="$PARAM[start]" />
<param name="end" value="$PARAM[end]" />
Expand All @@ -59,7 +59,7 @@
<param name="condition" value="$PARAM[condition]" />
<param name="reversible" value="$PARAM[reversible]" />
</include>
<include content="fadediffuse_template" condition="Skin.HasSetting(Experiment_Disable_Transitions)">
<include content="fadediffuse_template" condition="Skin.HasSetting(Quick_Transitions)">
<param name="type" value="$PARAM[type]" />
<param name="start" value="$PARAM[start]" />
<param name="end" value="$PARAM[end]" />
Expand Down Expand Up @@ -94,7 +94,6 @@
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="1.5x" />
<param name="quick_delay" value="1.5x" />
<param name="condition" value="$PARAM[fadein_condition]" />
</include>
<include content="fade_animation">
Expand All @@ -110,7 +109,6 @@
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="3x" />
<param name="quick_delay" value="3x" />
</include>
<include content="fade_animation">
<param name="type" value="WindowClose" />
Expand All @@ -123,7 +121,6 @@
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="1.5x" />
<param name="quick_delay" value="1.5x" />
<param name="condition" value="![Window.Previous(skinsettings) | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager)]" />
<param name="reversible" value="true" />
</include>
Expand All @@ -140,7 +137,6 @@
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="3x" />
<param name="quick_delay" value="3x" />
<param name="condition" value="![Window.Previous(skinsettings) | Window.Previous(interfacesettings) | Window.Previous(mediasettings) | Window.Previous(playersettings) | Window.Previous(systemsettings) | Window.Previous(servicesettings) | Window.Previous(gamesettings) | Window.Previous(pvrsettings) | Window.Previous(profiles) | Window.Previous(systeminfo) | Window.Previous(filemanager)]" />
<param name="reversible" value="true" />
</include>
Expand All @@ -157,7 +153,6 @@
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="0.5x" />
<param name="quick_delay" value="0.5x" />
</include>
<include content="fade_animation">
<param name="type" value="WindowClose" />
Expand All @@ -166,41 +161,6 @@
</include>
</include>

<include name="Light_Theme_Background_Fade_Animation">
<include content="fade_animation">
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
<param name="quick_delay" value="1x" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="WindowClose" />
<param name="time" value="1x" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
<param name="quick_delay" value="1x" />
<param name="condition" value="String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="condition" value="!String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
<param name="time" value="1x" />
<param name="condition" value="!String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
</include>

<!-- Fade in on Visible -->
<include name="Visible_Fade_Animation">
<include content="fade_animation">
Expand All @@ -214,7 +174,6 @@
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="1.5x" />
<param name="quick_delay" value="1.5x" />
</include>
</include>

Expand All @@ -223,16 +182,6 @@
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="3x" />
<param name="quick_delay" value="3x" />
</include>
</include>

<include name="Widget_Breadcrumb_Animation">
<include content="fade_Visible" condition="!Skin.HasSetting(Experiment_Disable_Transitions)">
<param name="time" value="Default_Transition_1x" />
<param name="delay" value="Default_Transition_1.5x" />
<param name="reversible" value="false" />
<param name="condition" value="Control.HasFocus(50) | Control.HasFocus(3201) | Control.HasFocus(3202) | Control.HasFocus(3203) | Control.HasFocus(3204) | Control.HasFocus(3205) | Control.HasFocus(3206) | Control.HasFocus(3207) | Control.HasFocus(3208) | Control.HasFocus(3209)" />
</include>
</include>

Expand All @@ -253,7 +202,6 @@
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="1.5x" />
<param name="quick_delay" value="1.5x" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
Expand All @@ -266,7 +214,6 @@
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="3x" />
<param name="quick_delay" value="3x" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
Expand All @@ -279,13 +226,11 @@
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="0.25x" />
<param name="quick_delay" value="0.25x" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
<param name="time" value="1x" />
<param name="delay" value="0.25x" />
<param name="quick_delay" value="0.25x" />
</include>
</include>

Expand All @@ -311,7 +256,7 @@
</include>

<include name="GridView_Fade_OnFocus_Animation">
<include content="fadediffuse_template" condition="!Skin.HasSetting(Experiment_Disable_Transitions)">
<include content="fadediffuse_template" condition="!Skin.HasSetting(Quick_Transitions)">
<param name="type" value="Focus" />
<param name="start" value="ffffffff" />
<param name="end" value="ff808080" />
Expand Down Expand Up @@ -346,6 +291,39 @@
<effect type="zoom" center="auto" end="108" time="21000" tween="sine" easing="inout" />
</animation>
</include>

<include name="Light_Theme_Background_Fade_Animation">
<include content="fade_animation">
<param name="type" value="WindowOpen" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="WindowClose" />
<param name="time" value="1x" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation"> <!-- Seperate visible fade with delay for when options menu is visible (during transition between views) -->
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="delay" value="1x" />
<param name="condition" value="String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="Visible" />
<param name="time" value="1x" />
<param name="condition" value="!String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
<include content="fade_animation">
<param name="type" value="Hidden" />
<param name="time" value="1x" />
<param name="condition" value="!String.IsEqual(Window(home).Property(OptionsMenu),Active)" />
<param name="reversible" value="true" />
</include>
</include>

<include name="Multiart_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="4000" tween="sine" easing="inout" reversible="false">WindowOpen</animation>
Expand All @@ -355,18 +333,22 @@
<include name="MusicPlayer_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true">VisibleChange</animation>
</include>

<include name="Options_Menu_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true">Visible</animation>
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="!$EXP[TransparentDialog_IsVisible] | [$EXP[Container_HasBackground] + $EXP[PanelDialog_IsVisible]]">Hidden</animation>
</include>

<include name="PlayerSeekLabel_Fade_Delayed_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1.5x" tween="sine" easing="inout" reversible="false">Visible</animation>
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="0" tween="sine" easing="inout" reversible="false">Hidden</animation>
</include>

<include name="Scrollbar_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="!Container.Scrolling">Visible</animation>
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_1x" tween="sine" easing="inout" reversible="true" condition="Container.Scrolling">Visible</animation>
</include>

<include name="Secondary_List_Scroll_Animation">
<param name="fadeout" default="true" />
<definition>
Expand All @@ -378,21 +360,34 @@
<animation effect="fade" start="100" end="0" time="Default_Transition_0.25x" delay="Default_Transition_1x" reversible="false" tween="sine" easing="inout" condition="Control.HasFocus(3100) + $PARAM[fadeout]">Conditional</animation>
</definition>
</include>

<include name="Trailer_Autoplay_Fade_Animation">
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false" condition="$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="Default_Transition_3x" tween="sine" easing="inout" reversible="false" condition="!$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
</include>

<include name="Trailer_Autoplay_Fade_Delayed_Animation">
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" delay="1500" tween="sine" easing="inout" reversible="false" condition="$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" delay="1500" tween="sine" easing="inout" reversible="false" condition="!$EXP[Trailer_Autoplay_IsVisible]">Conditional</animation>
</include>

<include name="Video_Breadcrumb_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false">Visible</animation>
<animation effect="fade" start="100" end="0" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false">Hidden</animation>
</include>

<include name="Video_Breadcrumb_Backing_Fade_Animation">
<animation effect="fade" start="0" end="100" time="Default_Transition_1x" tween="sine" easing="inout" reversible="false" condition="![!Skin.TimerIsRunning(video_playback_label_interruptor) + Integer.IsGreater(Skin.TimerElapsedSecs(video_playback),2) + Integer.IsLess(Skin.TimerElapsedSecs(video_playback),11)]">Visible</animation>
<animation effect="fade" start="100" end="0" time="Default_Transition_0.5x" tween="sine" easing="inout" reversible="false" condition="![!Skin.TimerIsRunning(video_playback_label_interruptor) + Integer.IsGreater(Skin.TimerElapsedSecs(video_playback),2) + Integer.IsLess(Skin.TimerElapsedSecs(video_playback),11)]">Hidden</animation>
</include>

<include name="Widget_Breadcrumb_Animation">
<include content="fade_Visible" condition="!Skin.HasSetting(Quick_Transitions)">
<param name="time" value="Default_Transition_1x" />
<param name="delay" value="Default_Transition_1.5x" />
<param name="reversible" value="false" />
<param name="condition" value="Control.HasFocus(50) | Control.HasFocus(3201) | Control.HasFocus(3202) | Control.HasFocus(3203) | Control.HasFocus(3204) | Control.HasFocus(3205) | Control.HasFocus(3206) | Control.HasFocus(3207) | Control.HasFocus(3208) | Control.HasFocus(3209)" />
</include>
</include>

</includes>
1 change: 1 addition & 0 deletions 16x9/Colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@
<!-- Diffuses -->
<!-- Use solid alpha for dimmed artwork to improve performance -->
<variable name="Home_Artwork_Diffuse">
<value condition="Skin.String(Background_Brightness,66)">$VAR[Brightness_66]</value>
<value condition="Skin.String(Background_Brightness,50)">$VAR[Brightness_50]</value>
<value condition="Skin.String(Background_Brightness,25)">$VAR[Brightness_25]</value>
<value>$VAR[Brightness_33]</value>
Expand Down
4 changes: 2 additions & 2 deletions 16x9/Components_Viewtype_502_Showcase.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
<width>$PARAM[width]</width>
<height>$PARAM[height]</height>
<control type="group">
<visible>!$EXP[Content_Switching]</visible>
<visible>!$EXP[Content_Switching_Minus_Exclusions]</visible>
<include content="Visible_Fade_Delayed_Long_Animation" />
<control type="grouplist">
<left>30</left>
Expand Down Expand Up @@ -609,7 +609,7 @@
<param name="focus_border_color" default="$VAR[Light_Color]" />
<param name="focus_border_texture" default="views/border_10px.png" />
<definition>
<include content="ShowcaseView_Animated">
<include content="ShowcaseView_Animated" condition="![Skin.HasSetting(Quick_Transitions) + Skin.HasSetting(Zero_Transitions)]">
<param name="target_id" value="$PARAM[target_id]" />
<param name="displaytype_label" value="$PARAM[displaytype_label]" />
<param name="displaytype_issquare" value="$PARAM[displaytype_issquare]" />
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Components_Viewtype_504_Strip.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,7 @@
<definition>
<control type="group">
<nested />
<include content="StripView_Animated">
<include content="StripView_Animated" condition="![Skin.HasSetting(Quick_Transitions) + Skin.HasSetting(Zero_Transitions)]">
<param name="target_id" value="$PARAM[target_id]" />
<param name="displaytype_label" value="$PARAM[displaytype_label]" />
<param name="displaytype_isfanart" value="$PARAM[displaytype_isfanart]" />
Expand Down
8 changes: 4 additions & 4 deletions 16x9/Components_Viewtype_505_Grid.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,18 +197,18 @@
<include content="GridView_Dropshadow_Small" condition="Skin.String(GridView_Size,Small)" />
<!-- Artwork -->
<control type="group">
<include content="Focus_Zoom_Animation" />
<include content="Focus_Zoom_Animation" condition="![Skin.HasSetting(Quick_Transitions) + Skin.HasSetting(Zero_Transitions)]" />
<include content="ListIcon_Static_Focused">
<param name="visible" value="$EXP[GridView_Display_Is$PARAM[displaytype_label]]" />
<param name="art_icon" value="$PARAM[art_icon]" />
<param name="art_diffuse" value="Skin.HasSetting(Experiment_Disable_Transitions) + ![$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb] | $EXP[ListItem(0)_NowPlaying]] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)" />
<param name="art_diffuse" value="Skin.HasSetting(Quick_Transitions) + ![$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb] | $EXP[ListItem(0)_NowPlaying]] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)" />
<param name="indicator" value="false" />
<param name="now_playing" value="$EXP[ListItem(0)_NowPlaying]" />
<param name="fallback" value="views/dark_grey_100.png" />
<!-- Multiart -->
<include content="Icon_Component_Multiart_Static" condition="Skin.HasSetting(Multiart_Slideshow) + [Window.Is(videos) | Window.Is(music)]">
<param name="fadetime" value="Default_Transition_1x" />
<param name="art_diffuse" value="Skin.HasSetting(Experiment_Disable_Transitions) + ![$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb] | $EXP[ListItem(0)_NowPlaying]] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)" />
<param name="art_diffuse" value="Skin.HasSetting(Quick_Transitions) + ![$EXP[GridView_Details_Off] | $EXP[GridView_Details_Breadcrumb] | $EXP[ListItem(0)_NowPlaying]] + !$EXP[TransparentDialog_IsVisible] + !Window.IsVisible(pictureinfo)" />
<param name="now_playing" value="$EXP[ListItem(0)_NowPlaying]" />
</include>
<!-- Progress overlay -->
Expand Down Expand Up @@ -1234,7 +1234,7 @@
<control type="group">
<animation effect="slide" start="0,0" end="60,0" time="0" condition="true">Conditional</animation>
<nested />
<include content="GridView_Animated">
<include content="GridView_Animated" condition="![Skin.HasSetting(Quick_Transitions) + Skin.HasSetting(Zero_Transitions)]">
<param name="target_id" value="$PARAM[target_id]" />
<param name="viewtype_label" value="Grid" />
<param name="displaytype_label" value="$PARAM[displaytype_label]" />
Expand Down
Loading

0 comments on commit 5918364

Please sign in to comment.