Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect ratio of bar left/right textures

Browse Source
This commit is contained in:
Florian Küpper committed 2017-09-07 22:28:25 +02:00
1 parent 222cc0ba03
commit 22338194b5
2 files changed
+37 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Output/Themes/Genius/Screens/ScreenSing.xml
+21 -21
View File
@@ -1694,7 +1694,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1713,7 +1713,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1732,7 +1732,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1751,7 +1751,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1770,7 +1770,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1789,7 +1789,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1808,7 +1808,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1827,7 +1827,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1846,7 +1846,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1865,7 +1865,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1884,7 +1884,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1903,7 +1903,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1922,7 +1922,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1941,7 +1941,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1960,7 +1960,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1979,7 +1979,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -1998,7 +1998,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -2017,7 +2017,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -2036,7 +2036,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -2055,7 +2055,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
@@ -2074,7 +2074,7 @@
<SkinProgressRight>RatingBarProgressRight</SkinProgressRight>
<ColorBackground Name="Visible" />
<ColorForeground Name="Visible" />
<Direction>Left</Direction>
<Direction>Right</Direction>
<AnimateMovement>TR_CONFIG_ON</AnimateMovement>
<AnimateColoring>TR_CONFIG_ON</AnimateColoring>
<Rect>
VocaluxeLib/Menu/CProgressBar.cs
+16 -16
View File
@@ -337,23 +337,23 @@ namespace VocaluxeLib.Menu
switch (_Theme.Direction)
{
case EDirection.Right:
_RectProgressBegin = new SRectF(Rect.X, Rect.Y, Rect.H, Rect.H, Rect.Z);
_TextureProgressBegin = _TextureProgressLeft;
_TextureProgressBegin = TextureProgressLeft;
_RectProgressBegin = new SRectF(Rect.X, Rect.Y, Rect.H * _TextureProgressBegin.OrigAspect, Rect.H, Rect.Z);
break;
case EDirection.Up:
_RectProgressBegin = new SRectF(Rect.X, Rect.Y + Rect.H - Rect.W, Rect.W, Rect.W, Rect.Z);
_TextureProgressBegin = _TextureProgressRight;
_TextureProgressBegin = TextureProgressRight;
_RectProgressBegin = new SRectF(Rect.X, Rect.Y + Rect.H - Rect.W * _TextureProgressBegin.OrigAspect, Rect.W, Rect.W * _TextureProgressBegin.OrigAspect, Rect.Z);
break;
case EDirection.Left:
_RectProgressBegin = new SRectF(Rect.X + Rect.W - Rect.H, Rect.Y, Rect.H, Rect.H, Rect.Z);
_TextureProgressBegin = _TextureProgressRight;
_TextureProgressBegin = TextureProgressRight;
_RectProgressBegin = new SRectF(Rect.X + Rect.W - Rect.H * _TextureProgressBegin.OrigAspect, Rect.Y, Rect.H *_TextureProgressBegin.OrigAspect, Rect.H, Rect.Z);
break;
case EDirection.Down:
_RectProgressBegin = new SRectF(Rect.X, Rect.Y, Rect.W, Rect.W, Rect.Z);
_TextureProgressBegin = _TextureProgressLeft;
_TextureProgressBegin = TextureProgressLeft;
_RectProgressBegin = new SRectF(Rect.X, Rect.Y, Rect.W, Rect.W * _TextureProgressBegin.OrigAspect, Rect.Z);
break;
}
}
@@ -364,21 +364,21 @@ namespace VocaluxeLib.Menu
switch (_Theme.Direction)
{
case EDirection.Right:
_RectProgressMid = new SRectF(Rect.X + Rect.H, Rect.Y, (Rect.W - 2 * Rect.H) * _ProgressCurrent, Rect.H, Rect.Z);
_RectProgressMid = new SRectF(_RectProgressBegin.X + _RectProgressBegin.W, Rect.Y, (Rect.W - 2 * Rect.H) * _ProgressCurrent, Rect.H, Rect.Z);
break;
case EDirection.Up:
float newHeight = (Rect.H - 2 * Rect.W) * _ProgressCurrent;
_RectProgressMid = new SRectF(Rect.X, Rect.Y + (Rect.H - Rect.W) - newHeight, Rect.W, newHeight, Rect.Z);
_RectProgressMid = new SRectF(Rect.X, _RectProgressBegin.Y - newHeight, Rect.W, newHeight, Rect.Z);
break;
case EDirection.Left:
float newWidth = (Rect.W - 2 * Rect.H) * _ProgressCurrent;
_RectProgressMid = new SRectF(Rect.X + (Rect.W - Rect.H) - newWidth, Rect.Y, newWidth, Rect.H, Rect.Z);
_RectProgressMid = new SRectF(_RectProgressBegin.X - newWidth, Rect.Y, newWidth, Rect.H, Rect.Z);
break;
case EDirection.Down:
_RectProgressMid = new SRectF(Rect.X, Rect.Y, (Rect.H - 2 * Rect.W) * _ProgressCurrent, Rect.W, Rect.Z);
_RectProgressMid = new SRectF(Rect.X, _RectProgressBegin.Y + _RectProgressBegin.H, (Rect.H - 2 * Rect.W) * _ProgressCurrent, Rect.W, Rect.Z);
break;
}
}
@@ -388,23 +388,23 @@ namespace VocaluxeLib.Menu
switch (_Theme.Direction)
{
case EDirection.Right:
_RectProgressEnd = new SRectF(_RectProgressMid.X + _RectProgressMid.W, Rect.Y, Rect.H, Rect.H, Rect.Z);
_TextureProgressEnd = _TextureProgressRight;
_RectProgressEnd = new SRectF(_RectProgressMid.X + _RectProgressMid.W, Rect.Y, Rect.H * _TextureProgressBegin.OrigAspect, Rect.H, Rect.Z);
break;
case EDirection.Up:
_RectProgressEnd = new SRectF(Rect.X, _RectProgressMid.Y + Rect.W, Rect.W, Rect.W, Rect.Z);
_TextureProgressEnd = _TextureProgressLeft;
_RectProgressEnd = new SRectF(Rect.X, _RectProgressMid.Y + Rect.W, Rect.W, Rect.W * _TextureProgressBegin.OrigAspect, Rect.Z);
break;
case EDirection.Left:
_RectProgressEnd = new SRectF(_RectProgressMid.X - Rect.H, Rect.Y, Rect.H, Rect.H, Rect.Z);
_TextureProgressEnd = _TextureProgressLeft;
_RectProgressEnd = new SRectF(_RectProgressMid.X - Rect.H, Rect.Y, Rect.H * _TextureProgressBegin.OrigAspect, Rect.H, Rect.Z);
break;
case EDirection.Down:
_RectProgressEnd = new SRectF(Rect.X, _RectProgressMid.Y + _RectProgressMid.H, Rect.W, Rect.W, Rect.Z);
_TextureProgressEnd = _TextureProgressRight;
_RectProgressEnd = new SRectF(Rect.X, _RectProgressMid.Y + _RectProgressMid.H, Rect.W, Rect.W * _TextureProgressBegin.OrigAspect, Rect.Z);
break;
}
}