Added possibility to define progress colors

This commit is contained in:
Florian Küpper committed 2017-09-07 23:44:05 +02:00
1 parent 22338194b5
commit e82ffd7f31
5 files changed
+702 -80

No files matched your search

+36
View File
@@ -260,6 +260,42 @@
<B>1.000</B> <B>1.000</B>
<A>0.700</A> <A>0.700</A>
</TextNameColor> </TextNameColor>
<RatingAwful>
<R>0.878</R>
<G>0.274</G>
<B>0.254</B>
<A>1.000</A>
</RatingAwful>
<RatingPoor>
<R>0.988</R>
<G>0.494</G>
<B>0.207</B>
<A>1.000</A>
</RatingPoor>
<RatingNotBad>
<R>0.988</R>
<G>0.843</G>
<B>0.207</B>
<A>1.000</A>
</RatingNotBad>
<RatingGood>
<R>0.921</R>
<G>0.988</G>
<B>0.207</B>
<A>1.000</A>
</RatingGood>
<RatingGreat>
<R>0.807</R>
<G>0.968</G>
<B>0.278</B>
<A>1.000</A>
</RatingGreat>
<RatingPerfect>
<R>0.482</R>
<G>0.937</G>
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
</Colors> </Colors>
<Skins> <Skins>
<BG_Default>BG_Default.png</BG_Default> <BG_Default>BG_Default.png</BG_Default>
+36
View File
@@ -260,6 +260,42 @@
<B>0.945</B> <B>0.945</B>
<A>0.700</A> <A>0.700</A>
</TextNameColor> </TextNameColor>
<RatingAwful>
<R>0.878</R>
<G>0.274</G>
<B>0.254</B>
<A>1.000</A>
</RatingAwful>
<RatingPoor>
<R>0.988</R>
<G>0.494</G>
<B>0.207</B>
<A>1.000</A>
</RatingPoor>
<RatingNotBad>
<R>0.988</R>
<G>0.843</G>
<B>0.207</B>
<A>1.000</A>
</RatingNotBad>
<RatingGood>
<R>0.921</R>
<G>0.988</G>
<B>0.207</B>
<A>1.000</A>
</RatingGood>
<RatingGreat>
<R>0.807</R>
<G>0.968</G>
<B>0.278</B>
<A>1.000</A>
</RatingGreat>
<RatingPerfect>
<R>0.482</R>
<G>0.937</G>
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
</Colors> </Colors>
<Skins> <Skins>
<BG_Default>BG_Default.png</BG_Default> <BG_Default>BG_Default.png</BG_Default>
+36
View File
@@ -260,6 +260,42 @@
<B>0.733</B> <B>0.733</B>
<A>0.700</A> <A>0.700</A>
</TextNameColor> </TextNameColor>
<RatingAwful>
<R>0.878</R>
<G>0.274</G>
<B>0.254</B>
<A>1.000</A>
</RatingAwful>
<RatingPoor>
<R>0.988</R>
<G>0.494</G>
<B>0.207</B>
<A>1.000</A>
</RatingPoor>
<RatingNotBad>
<R>0.988</R>
<G>0.843</G>
<B>0.207</B>
<A>1.000</A>
</RatingNotBad>
<RatingGood>
<R>0.921</R>
<G>0.988</G>
<B>0.207</B>
<A>1.000</A>
</RatingGood>
<RatingGreat>
<R>0.807</R>
<G>0.968</G>
<B>0.278</B>
<A>1.000</A>
</RatingGreat>
<RatingPerfect>
<R>0.482</R>
<G>0.937</G>
<B>0.027</B>
<A>1.000</A>
</RatingPerfect>
</Colors> </Colors>
<Skins> <Skins>
<BG_Default>BG_Default.png</BG_Default> <BG_Default>BG_Default.png</BG_Default>
+574 -28
View File
@@ -1693,7 +1693,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1701,9 +1701,35 @@
<X>1085</X> <X>1085</X>
<Y>410</Y> <Y>410</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP1N2"> <ProgressBar Name="ProgressBarRatingP1N2">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1712,7 +1738,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1720,9 +1746,35 @@
<X>1085</X> <X>1085</X>
<Y>170</Y> <Y>170</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP2N2"> <ProgressBar Name="ProgressBarRatingP2N2">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1731,7 +1783,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1739,9 +1791,35 @@
<X>1085</X> <X>1085</X>
<Y>430</Y> <Y>430</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP1N3"> <ProgressBar Name="ProgressBarRatingP1N3">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1750,7 +1828,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1761,6 +1839,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP2N3"> <ProgressBar Name="ProgressBarRatingP2N3">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1769,7 +1873,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1780,6 +1884,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP3N3"> <ProgressBar Name="ProgressBarRatingP3N3">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1788,7 +1918,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1799,6 +1929,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP1N4"> <ProgressBar Name="ProgressBarRatingP1N4">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1807,7 +1963,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1815,9 +1971,35 @@
<X>471</X> <X>471</X>
<Y>170</Y> <Y>170</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP2N4"> <ProgressBar Name="ProgressBarRatingP2N4">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1826,7 +2008,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1834,9 +2016,35 @@
<X>471</X> <X>471</X>
<Y>430</Y> <Y>430</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP3N4"> <ProgressBar Name="ProgressBarRatingP3N4">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1845,7 +2053,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1853,9 +2061,35 @@
<X>1105</X> <X>1105</X>
<Y>170</Y> <Y>170</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP4N4"> <ProgressBar Name="ProgressBarRatingP4N4">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1864,7 +2098,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1872,9 +2106,35 @@
<X>1105</X> <X>1105</X>
<Y>430</Y> <Y>430</Y>
<W>160</W> <W>160</W>
<H>10</H> <H>13</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP1N5"> <ProgressBar Name="ProgressBarRatingP1N5">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1883,7 +2143,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1894,6 +2154,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP2N5"> <ProgressBar Name="ProgressBarRatingP2N5">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1902,7 +2188,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1913,6 +2199,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP3N5"> <ProgressBar Name="ProgressBarRatingP3N5">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1921,7 +2233,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1932,6 +2244,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP4N5"> <ProgressBar Name="ProgressBarRatingP4N5">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1940,7 +2278,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1951,6 +2289,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP5N5"> <ProgressBar Name="ProgressBarRatingP5N5">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1959,7 +2323,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1970,6 +2334,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP1N6"> <ProgressBar Name="ProgressBarRatingP1N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1978,7 +2368,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -1989,6 +2379,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP2N6"> <ProgressBar Name="ProgressBarRatingP2N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -1997,7 +2413,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -2008,6 +2424,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP3N6"> <ProgressBar Name="ProgressBarRatingP3N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -2016,7 +2458,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -2027,6 +2469,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP4N6"> <ProgressBar Name="ProgressBarRatingP4N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -2035,7 +2503,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -2046,6 +2514,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP5N6"> <ProgressBar Name="ProgressBarRatingP5N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -2054,7 +2548,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -2065,6 +2559,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
<ProgressBar Name="ProgressBarRatingP6N6"> <ProgressBar Name="ProgressBarRatingP6N6">
<SkinBackground>RatingBarBackground</SkinBackground> <SkinBackground>RatingBarBackground</SkinBackground>
@@ -2073,7 +2593,7 @@
<SkinProgressMid>RatingBarProgressMid</SkinProgressMid> <SkinProgressMid>RatingBarProgressMid</SkinProgressMid>
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight> <SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" /> <ColorBackground Name="Visible" />
<ColorForeground Name="Visible" /> <ColorForeground Name="Invisible" />
<Direction>Right</Direction> <Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement> <AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring> <AnimateColoring>TR_CONFIG_ON</AnimateColoring>
@@ -2084,6 +2604,32 @@
<H>7</H> <H>7</H>
<Z>-0.75</Z> <Z>-0.75</Z>
</Rect> </Rect>
<ProgressColors>
<ProgressColor>
<From>0</From>
<Color Name="RatingAwful" />
</ProgressColor>
<ProgressColor>
<From>0.16</From>
<Color Name="RatingPoor" />
</ProgressColor>
<ProgressColor>
<From>0.33</From>
<Color Name="RatingNotBad" />
</ProgressColor>
<ProgressColor>
<From>0.5</From>
<Color Name="RatingGood" />
</ProgressColor>
<ProgressColor>
<From>0.62</From>
<Color Name="RatingGreat" />
</ProgressColor>
<ProgressColor>
<From>0.8</From>
<Color Name="RatingPerfect" />
</ProgressColor>
</ProgressColors>
</ProgressBar> </ProgressBar>
</ProgressBars> </ProgressBars>
<ScreenSettings /> <ScreenSettings />
+20 -52
View File
@@ -16,6 +16,7 @@
#endregion #endregion
using System; using System;
using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Xml.Serialization; using System.Xml.Serialization;
using VocaluxeLib.Draw; using VocaluxeLib.Draw;
@@ -23,6 +24,13 @@ using VocaluxeLib.Xml;
namespace VocaluxeLib.Menu namespace VocaluxeLib.Menu
{ {
[XmlType("ProgressColor")]
public struct SThemeProgressBarColor
{
public float From;
public SThemeColor Color;
}
[XmlType("ProgressBar")] [XmlType("ProgressBar")]
public struct SThemeProgressBar public struct SThemeProgressBar
{ {
@@ -38,6 +46,7 @@ namespace VocaluxeLib.Menu
public EOffOn AnimateMovement; public EOffOn AnimateMovement;
public EOffOn AnimateColoring; public EOffOn AnimateColoring;
public SRectF Rect; public SRectF Rect;
[XmlArrayItem("ProgressColor"), XmlArray] public List<SThemeProgressBarColor> ProgressColors;
public SReflection? Reflection; public SReflection? Reflection;
} }
@@ -115,9 +124,10 @@ namespace VocaluxeLib.Menu
set set
{ {
if (value != _ProgressTarget) if (value != _ProgressTarget)
_UpdateProgress(); {
_ProgressTarget = value; _ProgressTarget = value;
_UpdateProgress();
}
} }
} }
private float _ProgressCurrent; private float _ProgressCurrent;
@@ -163,6 +173,7 @@ namespace VocaluxeLib.Menu
{ {
_PartyModeID = partyModeID; _PartyModeID = partyModeID;
_Theme = theme; _Theme = theme;
_Theme.ProgressColors.Sort((x, y) => x.From.CompareTo(y.From));
_UpdateProgress(); _UpdateProgress();
ThemeLoaded = true; ThemeLoaded = true;
} }
@@ -185,7 +196,7 @@ namespace VocaluxeLib.Menu
if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme)) if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
{ {
/**
//Draw background //Draw background
SColorF color = new SColorF(ColorBackground.R, ColorBackground.G, ColorBackground.B, ColorBackground.A * Alpha); SColorF color = new SColorF(ColorBackground.R, ColorBackground.G, ColorBackground.B, ColorBackground.A * Alpha);
if (_TextureBackground != null) if (_TextureBackground != null)
@@ -196,7 +207,7 @@ namespace VocaluxeLib.Menu
} }
else else
CBase.Drawing.DrawRect(ColorBackground, Rect); CBase.Drawing.DrawRect(ColorBackground, Rect);
**/
//Draw progress //Draw progress
if (_TextureProgressBegin != null) if (_TextureProgressBegin != null)
{ {
@@ -224,40 +235,8 @@ namespace VocaluxeLib.Menu
} }
else else
CBase.Drawing.DrawRect(_ColorProgressCurrent, _RectProgressEnd); CBase.Drawing.DrawRect(_ColorProgressCurrent, _RectProgressEnd);
/*
//Width-related variables rounded and then floored to prevent 1px gaps in progress bar
SRectF rect = new SRectF(Rect.X, Rect.Y, (float)Math.Round(Rect.W), (float)Math.Round(Rect.H), Rect.Z);
int dh = (int)((1f - scale) * rect.H / 2);
int dw = (int)Math.Min(dh, rect.W / 2);
var progressRect = new SRectF(rect.X + dw, rect.Y + dh, rect.W - 2 * dw, rect.H - 2 * dh, rect.Z);
//Width of each of the ends (round parts)
//Need 2 of them so use minimum
int endsW = (int)Math.Min(progressRect.H * _TextureProgressLeft.OrigAspect, progressRect.W / 2);
CBase.Drawing.DrawTexture(_TextureProgressLeft, new SRectF(progressRect.X, progressRect.Y, endsW, progressRect.H, progressRect.Z), color);
SRectF middleRect = new SRectF(progressRect.X + endsW, progressRect.Y, progressRect.W - 2 * endsW, progressRect.H, progressRect.Z);
int midW = (int)Math.Round(progressRect.H * _TextureProgressMid.OrigAspect);
int midCount = (int)middleRect.W / midW;
for (int i = 0; i < midCount; ++i)
{
CBase.Drawing.DrawTexture(_TextureProgressMid, new SRectF(middleRect.X + (i * midW), progressRect.Y, midW, progressRect.H, progressRect.Z), color);
}
SRectF lastMidRect = new SRectF(middleRect.X + midCount * midW, progressRect.Y, middleRect.W - (midCount * midW), progressRect.H, progressRect.Z);
CBase.Drawing.DrawTexture(_TextureProgressMid, new SRectF(middleRect.X + (midCount * midW), middleRect.Y, midW, middleRect.H, middleRect.Z), color, lastMidRect);
CBase.Drawing.DrawTexture(_TextureProgressRight, new SRectF(progressRect.X + progressRect.W - endsW, progressRect.Y, endsW, progressRect.H, progressRect.Z), color);
*/
//Draw foreground //Draw foreground
/**
color = new SColorF(ColorForeground.R, ColorForeground.G, ColorForeground.B, ColorForeground.A * Alpha); color = new SColorF(ColorForeground.R, ColorForeground.G, ColorForeground.B, ColorForeground.A * Alpha);
if (_TextureForeground != null) if (_TextureForeground != null)
{ {
@@ -267,23 +246,8 @@ namespace VocaluxeLib.Menu
} }
else else
CBase.Drawing.DrawRect(ColorForeground, Rect); CBase.Drawing.DrawRect(ColorForeground, Rect);
*/
} }
/*
var color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha);
if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
{
if (texture != null)
{
CBase.Drawing.DrawTexture(texture, rect, color, bounds);
if (Reflection)
CBase.Drawing.DrawTextureReflection(texture, rect, color, bounds, ReflectionSpace, ReflectionHeight);
}
else
CBase.Drawing.DrawRect(color, rect);
}*/
if (Selected && (CBase.Settings.GetProgramState() == EProgramState.EditTheme)) if (Selected && (CBase.Settings.GetProgramState() == EProgramState.EditTheme))
CBase.Drawing.DrawRect(new SColorF(1f, 1f, 1f, 0.5f), Rect); CBase.Drawing.DrawRect(new SColorF(1f, 1f, 1f, 0.5f), Rect);
} }
@@ -326,7 +290,11 @@ namespace VocaluxeLib.Menu
private void _UpdateProgress() private void _UpdateProgress()
{ {
_ColorProgressCurrent = new SColorF(1, 1, 1, 1); foreach (SThemeProgressBarColor col in _Theme.ProgressColors)
if (col.From < _ProgressTarget)
col.Color.Get(_PartyModeID, out _ColorProgressTarget);
_ColorProgressCurrent = _ColorProgressTarget;
_UpdateProgressLeft(); _UpdateProgressLeft();
_UpdateProgressMid(); _UpdateProgressMid();
_UpdateProgressRight(); _UpdateProgressRight();