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.

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

Complete color rework & highlighting fixes #55

Merged
merged 6 commits into from Dec 19, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
52 changes: 19 additions & 33 deletions 16x9/AddonBrowser.xml
Expand Up @@ -22,7 +22,7 @@
<width>405</width>
<height>600</height>
<texture>$INFO[ListItem.Icon]</texture>
<colordiffuse>OverlayColorFO</colordiffuse>
<colordiffuse>$VAR[OverlayColorFO]</colordiffuse>
<aspectratio aligny="center">keep</aspectratio>
</control>

Expand Down Expand Up @@ -51,7 +51,7 @@
<height>72</height>
<font>Font36</font>
<label>[LIGHT]$INFO[ListItem.Label][/LIGHT]</label>
<textcolor>TextColor2</textcolor>
<textcolor>$VAR[TextColor2]</textcolor>
</control>
</itemlayout>

Expand All @@ -63,7 +63,7 @@
<height>144</height>
<font>Font72</font>
<label>[B]$INFO[ListItem.Label][/B]</label>
<textcolor>TextColor1</textcolor>
<textcolor>$VAR[TextColor1]</textcolor>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(500)">Conditional</animation>
<visible>String.IsEmpty(ListItem.Label2)</visible>
</control>
Expand All @@ -72,16 +72,9 @@
<top>0</top>
<width>1018</width>
<height>144</height>
<texture>$VAR[focus144]</texture>
<visible>String.IsEmpty(ListItem.Label2) + !ListItem.IsParentFolder + Control.HasFocus(500)</visible>
</control>
<control type="image">
<left>32</left>
<top>0</top>
<width>1018</width>
<height>144</height>
<texture colordiffuse="TextColor2">$VAR[focus144]</texture>
<visible>String.IsEmpty(ListItem.Label2) + !ListItem.IsParentFolder + !Control.HasFocus(500)</visible>
<texture colordiffuse="$VAR[TextColor1]">$VAR[focus144]</texture>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(500)">Conditional</animation>
<visible>String.IsEmpty(ListItem.Label2) + !ListItem.IsParentFolder</visible>
</control>
<control type="group">
<visible>!String.IsEmpty(ListItem.Label2)</visible>
Expand All @@ -92,34 +85,27 @@
<height>48</height>
<font>Font48</font>
<label>[B]$VAR[Label1][/B]</label>
<textcolor>TextColor1</textcolor>
<textcolor>$VAR[TextColor1]</textcolor>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(500)">Conditional</animation>
</control>
<control type="image">
<control type="label">
<left>32</left>
<top>25</top>
<top>82</top>
<width>1018</width>
<height>58</height>
<texture>$VAR[focus58]</texture>
<visible>!ListItem.IsParentFolder + Control.HasFocus(500)</visible>
<height>27</height>
<font>Font27</font>
<label>$INFO[ListItem.Label2]</label>
<textcolor>$VAR[TextColor1]</textcolor>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(500)">Conditional</animation>
</control>
<control type="image">
<left>32</left>
<top>25</top>
<width>1018</width>
<height>58</height>
<texture colordiffuse="TextColor2">$VAR[focus58]</texture>
<visible>!ListItem.IsParentFolder + !Control.HasFocus(500)</visible>
</control>
<control type="label">
<left>32</left>
<top>82</top>
<width>1018</width>
<height>27</height>
<font>Font27</font>
<label>$INFO[ListItem.Label2]</label>
<textcolor>TextColor1</textcolor>
<texture colordiffuse="$VAR[TextColor1]">$VAR[focus58]</texture>
<animation effect="fade" start="100" end="50" time="200" tween="cubic" easing="out" reversible="true" condition="!Control.HasFocus(500)">Conditional</animation>
<visible>!ListItem.IsParentFolder</visible>
</control>
</control>
</focusedlayout>
Expand All @@ -136,10 +122,10 @@
<onright>500</onright>
<showonepage>false</showonepage>
<orientation>vertical</orientation>
<colordiffuse>OverlayColorNF</colordiffuse>
<colordiffuse>$VAR[OverlayColorNF]</colordiffuse>
<texturesliderbackground border="9,1,6,1">common/ScrollBackground.png</texturesliderbackground>
<texturesliderbar border="8,1,6,1">common/ScrollbarGripNF.png</texturesliderbar>
<texturesliderbarfocus border="8,1,6,1" colordiffuse="DialogColor1">common/ScrollbarGripFO.png</texturesliderbarfocus>
<texturesliderbarfocus border="8,1,6,1" colordiffuse="$VAR[DialogColor1]">common/ScrollbarGripFO.png</texturesliderbarfocus>
<textureslidernib></textureslidernib>
<textureslidernibfocus></textureslidernibfocus>
<visible>!Skin.HasSetting(Scrollbars) + Control.IsVisible(500)</visible>
Expand All @@ -152,7 +138,7 @@
<control type="group" id="9002">
<control type="image">
<include>FullscreenDimensions</include>
<texture colordiffuse="DarkenColor">dialogs/DialogTextBackground.png</texture>
<texture colordiffuse="$VAR[DarkenColor]">dialogs/DialogTextBackground.png</texture>
<animation effect="fade" start="0" end="100" time="200">Visible</animation>
<animation effect="fade" start="100" end="0" time="200">Hidden</animation>
<visible>ControlGroup(9002).HasFocus</visible>
Expand Down
2 changes: 1 addition & 1 deletion 16x9/Custom_Cache_Progress.xml
Expand Up @@ -42,7 +42,7 @@
<width>550</width>
<height>2</height>
<visible>true</visible>
<midtexture colordiffuse="DialogColor1">common/white.png</midtexture>
<midtexture colordiffuse="$VAR[DialogColor1]">common/white.png</midtexture>
<info>Player.Progress</info>
</control>
<control type="progress">
Expand Down