Skip to content

Commit 04b9e73

Browse files
MikeSiLVOMikeSiLVO
committed
alignment adjustments
1 parent 380d9e0 commit 04b9e73

File tree

5 files changed

+29
-27
lines changed

5 files changed

+29
-27
lines changed

‎16x9/DialogExtendedProgressBar.xml

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@
88
</animation>
99
<controls>
1010
<control type="group">
11-
<visible>!Window.IsActive(fullscreenvideo) + !Window.IsActive(visualisation) + !Window.IsActive(startup)</visible>
11+
<visible>!Window.IsVisible(fullscreenvideo) + !Window.IsVisible(visualisation) + !Window.IsActive(startup)</visible>
12+
<animation type="Visible" reversible="false">
13+
<effect type="slide" start="0,-138" tween="cubic" easing="inout" time="720" />
14+
</animation>
15+
<animation type="Hidden" reversible="false">
16+
<effect type="slide" end="0,-138" tween="cubic" easing="inout" time="720" />
17+
</animation>
1218
<width>110%</width>
1319
<control type="image">
1420
<left>-5%</left>

‎16x9/DialogFullScreenInfo.xml

+6-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
<font>font10</font>
6868
<textcolor>grey2</textcolor>
6969
<wrapmultiline>true</wrapmultiline>
70-
<animation effect="fade" delay="300" time="200">WindowOpen</animation>
70+
<animation effect="fade" time="300">Visible</animation>
7171
<visible>String.IsEmpty(Control.GetLabel(142099))</visible>
7272
</control>
7373
</control>
@@ -80,12 +80,12 @@
8080
<control type="image">
8181
<width>274</width>
8282
<include>MediaFlagValues</include>
83-
<texture>$VAR[MediaFlagsPathVar]/videocodec/$VAR[VideoSourceFlagVar]</texture>
83+
<texture>$VAR[MediaFlagsPathVar]/resolution/$INFO[VideoPlayer.VideoResolution,,.png]</texture>
8484
</control>
8585
<control type="image">
8686
<width>274</width>
8787
<include>MediaFlagValues</include>
88-
<texture>$VAR[MediaFlagsPathVar]/resolution/$INFO[VideoPlayer.VideoResolution,,.png]</texture>
88+
<texture>$VAR[MediaFlagsPathVar]/videocodec/$VAR[VideoSourceFlagVar]</texture>
8989
</control>
9090
<control type="image">
9191
<width>274</width>
@@ -114,6 +114,7 @@
114114
<height>800</height>
115115
<texture border="40">listpanel_back.png</texture>
116116
<visible>VideoPlayer.HasInfo</visible>
117+
<animation effect="slide" end="0,-40" condition="VideoPlayer.HasInfo + ![VideoPlayer.Content(movies) | VideoPlayer.Content(episodes) | VideoPlayer.Content(musicvideos)]">Conditional</animation>
117118
</control>
118119
<control type="group">
119120
<visible>VideoPlayer.Content(movies) | VideoPlayer.Content(episodes) | VideoPlayer.Content(musicvideos)</visible>
@@ -350,6 +351,7 @@
350351
</control> -->
351352
<control type="grouplist">
352353
<!-- <visible>String.IsEmpty(VideoPlayer.Rating(tomatometerallcritics))</visible> -->
354+
<visible>!VideoPlayer.Content(episodes)</visible>
353355
<visible>!String.IsEmpty(Window(Home).Property(SkinHelper.Player.RottenTomatoes.Image)) + !String.IsEmpty(Window(Home).Property(SkinHelper.Player.RottenTomatoes.Rating))</visible>
354356
<width>140</width>
355357
<orientation>horizontal</orientation>
@@ -370,6 +372,7 @@
370372
</control>
371373
<control type="grouplist">
372374
<!-- <visible>String.IsEmpty(VideoPlayer.Rating(metacritic))</visible> -->
375+
<visible>!VideoPlayer.Content(episodes)</visible>
373376
<visible>!String.IsEmpty(Window(Home).Property(SkinHelper.Player.RottenTomatoes.Rating))</visible>
374377
<width>140</width>
375378
<itemgap>3</itemgap>

‎16x9/Includes_Home.xml

+8-15
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@
802802
<animation effect="slide" tween="cubic" time="720" end="0,1080" start="0,0" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
803803
<animation effect="slide" tween="cubic" time="720" start="0,-1080" end="0,0" condition="!Skin.HasSetting(centermainmenu) | String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowOpen</animation>
804804
<animation effect="slide" tween="cubic" time="720" end="0,-1080" start="0,0" condition="!Skin.HasSetting(centermainmenu) | String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
805-
<animation effect="slide" end="0,670" time="320" tween="cubic" easing="inout" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
805+
<animation effect="slide" end="0,610" time="320" tween="cubic" easing="inout" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
806806
<animation effect="slide" end="425,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
807807
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended) + ControlGroup(90010).HasFocus">Conditional</animation>
808808
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended) + ControlGroup(90020).HasFocus">Conditional</animation>
@@ -821,7 +821,7 @@
821821
</control>
822822
<control type="group">
823823
<left>40</left>
824-
<top>50</top>
824+
<top>82</top>
825825
<visible>VideoPlayer.Content(movies) | VideoPlayer.Content(episodes)</visible>
826826
<control type="group">
827827
<control type="image">
@@ -913,7 +913,7 @@
913913
</control>
914914
<control type="group">
915915
<left>40</left>
916-
<top>50</top>
916+
<top>82</top>
917917
<visible>[VideoPlayer.Content(musicvideos) | VideoPlayer.Content(livetv) | Player.IsInternetStream] + ![VideoPlayer.Content(episodes) | VideoPlayer.Content(movies)]</visible>
918918
<control type="group">
919919
<control type="image">
@@ -1054,7 +1054,7 @@
10541054
<animation effect="slide" tween="cubic" time="720" end="0,1080" start="0,0" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
10551055
<animation effect="slide" tween="cubic" time="720" start="0,-1080" end="0,0" condition="!Skin.HasSetting(centermainmenu) | String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowOpen</animation>
10561056
<animation effect="slide" tween="cubic" time="720" end="0,-1080" start="0,0" condition="!Skin.HasSetting(centermainmenu) | String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
1057-
<animation effect="slide" end="0,675" time="320" tween="cubic" easing="inout" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
1057+
<animation effect="slide" end="0,615" time="320" tween="cubic" easing="inout" condition="Skin.HasSetting(centermainmenu) + !String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
10581058
<animation effect="slide" end="425,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
10591059
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended) + ControlGroup(90010).HasFocus">Conditional</animation>
10601060
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended) + ControlGroup(90020).HasFocus">Conditional</animation>
@@ -1073,7 +1073,7 @@
10731073
</control>
10741074
<control type="group">
10751075
<left>40</left>
1076-
<top>50</top>
1076+
<top>82</top>
10771077
<visible>!Player.IsInternetStream + !VideoPlayer.Content(livetv)</visible>
10781078
<control type="image">
10791079
<left>90</left>
@@ -1146,21 +1146,14 @@
11461146
</control>
11471147
<control type="group">
11481148
<left>40</left>
1149-
<top>50</top>
1149+
<top>82</top>
11501150
<visible>Player.IsInternetStream | VideoPlayer.Content(livetv)</visible>
11511151
<control type="image">
1152-
<top>-20</top>
1153-
<left>-20</left>
11541152
<width>340</width>
11551153
<height>340</height>
1156-
<texture colordiffuse="11FFFFFF">back.png</texture>
1157-
<bordertexture border="20">thumbs/thumb_shadow.png</bordertexture>
1158-
<bordersize>20</bordersize>
1159-
</control>
1160-
<control type="image">
1161-
<width>300</width>
1162-
<height>300</height>
11631154
<aspectratio>keep</aspectratio>
1155+
<bordersize>20</bordersize>
1156+
<bordertexture border="20">thumbs/thumb_shadow.png</bordertexture>
11641157
<texture fallback="DefaultVideoCover.png">$VAR[HomeNowPlayingThumbVar]</texture>
11651158
</control>
11661159
<control type="grouplist">

‎16x9/Includes_Widgets.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<animation effect="slide" tween="cubic" time="720" start="1920,0" end="0,0" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowOpen</animation>
99
<animation effect="slide" tween="cubic" time="720" end="1920,0" start="0,0" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
1010
<animation effect="slide" end="0,-349" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
11-
<animation effect="slide" end="220,-64" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + !String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended)">Conditional</animation>
12-
<animation effect="slide" end="425,-64" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended)">Conditional</animation>
11+
<animation effect="slide" end="220,-34" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + !String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended)">Conditional</animation>
12+
<animation effect="slide" end="425,-34" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended)">Conditional</animation>
1313
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended) + !String.Contains(Container(9000).ListItem.Property(widgetStyle),List) + ControlGroup(90010).HasFocus">Conditional</animation>
1414
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended) + !String.Contains(Container(9000).ListItem.Property(widgetStyle),List) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended) + ControlGroup(90020).HasFocus">Conditional</animation>
1515
<animation effect="fade" start="100" end="0" condition="!String.IsEmpty(Container(9000).ListItem.Property(widgetHide)) + !ControlGroup(90010).HasFocus">Conditional</animation>
@@ -28,8 +28,8 @@
2828
<animation effect="slide" tween="cubic" time="720" start="1920,0" end="0,0" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowOpen</animation>
2929
<animation effect="slide" tween="cubic" time="720" end="1920,0" start="0,0" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">WindowClose</animation>
3030
<animation effect="slide" end="0,601" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
31-
<animation effect="slide" end="220,633" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + !String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended)">Conditional</animation>
32-
<animation effect="slide" end="425,633" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended)">Conditional</animation>
31+
<animation effect="slide" end="220,603" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + !String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended)">Conditional</animation>
32+
<animation effect="slide" end="425,603" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended)">Conditional</animation>
3333
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended) + !String.Contains(Container(9000).ListItem.Property(widgetStyle.2),List) + ControlGroup(90020).HasFocus">Conditional</animation>
3434
<animation effect="slide" end="-410,0" time="320" tween="cubic" easing="inout" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical) + String.Contains(Container(9000).ListItem.Property(widgetStyle.2),Extended) + !String.Contains(Container(9000).ListItem.Property(widgetStyle.2),List) + String.Contains(Container(9000).ListItem.Property(widgetStyle),Extended) + ControlGroup(90010).HasFocus">Conditional</animation>
3535
<animation effect="fade" start="100" end="0" condition="!String.IsEmpty(Container(9000).ListItem.Property(widgetHide.2)) + !ControlGroup(90020).HasFocus">Conditional</animation>

‎shortcuts/template.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,7 @@
882882
<control type="group">
883883
<visible>Control.HasFocus(8011$SKINSHORTCUTS[id])</visible>
884884
<animation effect="slide" end="0,950" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
885-
<animation effect="slide" end="0,697" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
885+
<animation effect="slide" end="0,677" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
886886
<top>90</top>
887887
<left>245</left>
888888
<control type="group">
@@ -1109,7 +1109,7 @@
11091109
<control type="group">
11101110
<visible>Control.HasFocus(8011$SKINSHORTCUTS[id])</visible>
11111111
<animation effect="slide" end="0,950" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
1112-
<animation effect="slide" end="0,697" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
1112+
<animation effect="slide" end="0,677" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
11131113
<top>90</top>
11141114
<left>40</left>
11151115
<control type="group">
@@ -1336,7 +1336,7 @@
13361336
<control type="group">
13371337
<visible>Control.HasFocus(8011$SKINSHORTCUTS[id])</visible>
13381338
<animation effect="slide" end="0,950" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
1339-
<animation effect="slide" end="0,697" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
1339+
<animation effect="slide" end="0,677" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
13401340
<top>90</top>
13411341
<left>245</left>
13421342
<control type="group">
@@ -1563,7 +1563,7 @@
15631563
<control type="group">
15641564
<visible>Control.HasFocus(8011$SKINSHORTCUTS[id])</visible>
15651565
<animation effect="slide" end="0,950" condition="!String.IsEqual(Skin.String(MainMenu.Layout),vertical) + Skin.HasSetting(centermainmenu)">Conditional</animation>
1566-
<animation effect="slide" end="0,697" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
1566+
<animation effect="slide" end="0,677" condition="String.IsEqual(Skin.String(MainMenu.Layout),vertical)">Conditional</animation>
15671567
<top>90</top>
15681568
<left>40</left>
15691569
<control type="group">

0 commit comments

Comments
 (0)