Reload (hopefully) all colors now on skin-change.
This commit is contained in:
1 parent
37cef42151
commit
114dbe6965
3 files changed
+35
-11
No files matched your search
@@ -690,6 +690,16 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
_Cursor.UnloadTextures();
|
_Cursor.UnloadTextures();
|
||||||
|
|
||||||
|
if (CTheme.Cursor.color != string.Empty)
|
||||||
|
{
|
||||||
|
SColorF color;
|
||||||
|
color = CTheme.GetColor(CTheme.Cursor.color);
|
||||||
|
CTheme.Cursor.r = color.R;
|
||||||
|
CTheme.Cursor.g = color.G;
|
||||||
|
CTheme.Cursor.b = color.B;
|
||||||
|
CTheme.Cursor.a = color.A;
|
||||||
|
}
|
||||||
|
|
||||||
_Cursor = new CCursor(
|
_Cursor = new CCursor(
|
||||||
CTheme.Cursor.SkinName,
|
CTheme.Cursor.SkinName,
|
||||||
new SColorF(CTheme.Cursor.r, CTheme.Cursor.g, CTheme.Cursor.b, CTheme.Cursor.a),
|
new SColorF(CTheme.Cursor.r, CTheme.Cursor.g, CTheme.Cursor.b, CTheme.Cursor.a),
|
||||||
|
|||||||
@@ -90,17 +90,7 @@ namespace Vocaluxe.Menu
|
|||||||
|
|
||||||
public void Init()
|
public void Init()
|
||||||
{
|
{
|
||||||
_Tiles.Clear();
|
PrepareTiles();
|
||||||
for (int i = 0; i < _NumH; i++)
|
|
||||||
{
|
|
||||||
for (int j = 0; j < _NumW; j++)
|
|
||||||
{
|
|
||||||
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
|
|
||||||
CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect);
|
|
||||||
CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
|
|
||||||
_Tiles.Add(new CTile(tileStatic, tileText, -1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PlayerSelector = new CStatic();
|
PlayerSelector = new CStatic();
|
||||||
PlayerSelector.Texture = _TextureTileSelected;
|
PlayerSelector.Texture = _TextureTileSelected;
|
||||||
@@ -482,12 +472,35 @@ namespace Vocaluxe.Menu
|
|||||||
{
|
{
|
||||||
_TextureEmptyTile = CTheme.GetSkinTexture(_Theme.TextureEmptyTileName);
|
_TextureEmptyTile = CTheme.GetSkinTexture(_Theme.TextureEmptyTileName);
|
||||||
_TextureTileSelected = CTheme.GetSkinTexture(_Theme.TextureTileSelectedName);
|
_TextureTileSelected = CTheme.GetSkinTexture(_Theme.TextureTileSelectedName);
|
||||||
|
|
||||||
|
if (_Theme.ColorEmptyTileName != String.Empty)
|
||||||
|
ColorEmptyTile = CTheme.GetColor(_Theme.ColorEmptyTileName);
|
||||||
|
|
||||||
|
if (_Theme.NameColorName != String.Empty)
|
||||||
|
_Theme.NameColor = CTheme.GetColor(_Theme.NameColorName);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ReloadTextures()
|
public void ReloadTextures()
|
||||||
{
|
{
|
||||||
UnloadTextures();
|
UnloadTextures();
|
||||||
LoadTextures();
|
LoadTextures();
|
||||||
|
|
||||||
|
PrepareTiles();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PrepareTiles()
|
||||||
|
{
|
||||||
|
_Tiles.Clear();
|
||||||
|
for (int i = 0; i < _NumH; i++)
|
||||||
|
{
|
||||||
|
for (int j = 0; j < _NumW; j++)
|
||||||
|
{
|
||||||
|
SRectF rect = new SRectF(Rect.X + j * (_TileW + _SpaceW), Rect.Y + i * (_TileH + _SpaceH), _TileW, _TileH, Rect.Z);
|
||||||
|
CStatic tileStatic = new CStatic(_TextureEmptyTile, ColorEmptyTile, rect);
|
||||||
|
CText tileText = new CText(rect.X + rect.W / 2, rect.Y + rect.H + _Theme.NameSpace, rect.Z, _Theme.NameHeight, rect.W, EAlignment.Center, _Theme.NameStyle, _Theme.NameFont, _Theme.NameColor, "");
|
||||||
|
_Tiles.Add(new CTile(tileStatic, tileText, -1));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UpdateVisibleProfiles()
|
private void UpdateVisibleProfiles()
|
||||||
|
|||||||
@@ -654,6 +654,7 @@ namespace Vocaluxe.Menu.SongMenu
|
|||||||
|
|
||||||
_Theme.songMenuTileBoard.TextArtist.ReloadTextures();
|
_Theme.songMenuTileBoard.TextArtist.ReloadTextures();
|
||||||
_Theme.songMenuTileBoard.TextTitle.ReloadTextures();
|
_Theme.songMenuTileBoard.TextTitle.ReloadTextures();
|
||||||
|
_Theme.songMenuTileBoard.TextSongLength.ReloadTextures();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user