Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[NowPlaying] focus controls instead main menu (2) #989

Merged
merged 1 commit into from
Apr 15, 2023
Merged

[NowPlaying] focus controls instead main menu (2) #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 8 additions & 3 deletions 1080i/Custom_NowPlaying_Helper.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@
<onload condition="$EXP[ExtendedNowPlayingHelperAutoClose] + $EXP[HasHomemenuAutoSlideOutAnimation]">SetFocus(2011)</onload>
<onload condition="$EXP[ExtendedNowPlayingHelperAutoClose]">ClearProperty(controlsvisible,home)</onload>

<!-- Show Now Playing -->
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow] + !$EXP[HasHomemenuAutoSlideOutAnimation] + !$EXP[HasHomemenuAutoSlideOutAnimationOnlyIfWidgetIsFocused]">SetFocus(300)</onload>
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow] + [$EXP[HasHomemenuAutoSlideOutAnimation] | $EXP[HasHomemenuAutoSlideOutAnimationOnlyIfWidgetIsFocused]]">SetFocus(2011)</onload>
<!-- Show Now Playing + Controls Hidden -->
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow] + !$EXP[HasHomemenuAutoSlideOutAnimation] + !$EXP[HasHomemenuAutoSlideOutAnimationOnlyIfWidgetIsFocused] + Skin.HasSetting(hide.home.nowplaying.controls)">SetFocus(300)</onload>
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow] + [$EXP[HasHomemenuAutoSlideOutAnimation] | $EXP[HasHomemenuAutoSlideOutAnimationOnlyIfWidgetIsFocused]] + Skin.HasSetting(hide.home.nowplaying.controls)">SetFocus(2011)</onload>

<!-- Show Now Playing + Controls Visible -->
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow] + !Skin.HasSetting(hide.home.nowplaying.controls)">SetFocus(777)</onload>

<!-- Clear Now Playing Property -->
<onload condition="$EXP[ExtendedNowPlayingHelperAutoShow]">ClearProperty(nowplayingautoshowtimer,home)</onload>

<controls />
Expand Down
9 changes: 4 additions & 5 deletions 1080i/Includes_NowPlaying.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@
<includes>
<include name="ExtendedNowPlaying">
<control type="group">
<visible>$EXP[ExtendedNowPlayingIsVisible]</visible>
<animation effect="fade" start="100" end="0" tween="sine" reversible="false" easing="out" time="350">Hidden</animation>
<animation effect="fade" start="0" end="100" tween="sine" reversible="false" easing="in" delay="350" time="450">Visible</animation>
<animation effect="fade" start="100" end="0" tween="sine" reversible="false" easing="out" time="350" condition="!$EXP[ExtendedNowPlayingIsVisible]">Conditional</animation>
<animation effect="fade" start="0" end="100" tween="sine" reversible="false" easing="in" delay="350" time="450" condition="$EXP[ExtendedNowPlayingIsVisible]">Conditional</animation>
<height>770</height>
<include content="def_bottom" condition="!Skin.HasSetting(home.widgets.show.reflections)">
<param name="bottom" value="188" />
Expand Down Expand Up @@ -540,8 +539,8 @@
<effect type="fade" start="100" end="0" time="150" delay="0"/>
</animation>
<animation type="Conditional" condition="Control.HasFocus(300) | Control.HasFocus(302) | Control.HasFocus(2011) | ControlGroup(777).HasFocus() | Control.HasFocus(778) | Control.HasFocus(779) | Control.HasFocus(780)" reversible="false">
<effect type="slide" start="-145,0" end="0,0" tween="sine" easing="out" time="600" delay="500"/>
<effect type="fade" start="0" end="100" time="1" delay="500"/>
<effect type="slide" start="-145,0" end="0,0" tween="sine" easing="out" time="600" delay="700"/>
<effect type="fade" start="0" end="100" time="1" delay="700"/>
</animation>
<visible>Player.HasMedia + Player.HasAudio</visible>
<visible>!Skin.HasSetting(extended.nowplaying.hidecd)</visible>
Expand Down