equalizer converted

This commit is contained in:
Alexander Eckart committed 2012-12-13 22:00:57 +01:00
1 parent 2945357298
commit 2e3fe88d40
2 files changed
+7 -9

No files matched your search

+6 -9
View File
@@ -5,9 +5,6 @@ using System.Text;
using System.Xml; using System.Xml;
using System.Xml.XPath; using System.Xml.XPath;
using Vocaluxe.Base;
using Vocaluxe.Lib.Draw;
namespace Vocaluxe.Menu namespace Vocaluxe.Menu
{ {
enum EEqualizerStyle enum EEqualizerStyle
@@ -97,7 +94,7 @@ namespace Vocaluxe.Menu
if (CHelper.GetValueFromXML(item + "/Color", navigator, ref _Theme.ColorName, String.Empty)) if (CHelper.GetValueFromXML(item + "/Color", navigator, ref _Theme.ColorName, String.Empty))
{ {
_ThemeLoaded &= CTheme.GetColor(_Theme.ColorName, SkinIndex, ref Color); _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
} }
else else
{ {
@@ -109,7 +106,7 @@ namespace Vocaluxe.Menu
if (CHelper.GetValueFromXML(item + "/MaxColor", navigator, ref _Theme.MaxColorName, String.Empty)) if (CHelper.GetValueFromXML(item + "/MaxColor", navigator, ref _Theme.MaxColorName, String.Empty))
{ {
_ThemeLoaded &= CTheme.GetColor(_Theme.ColorName, SkinIndex, ref Color); _ThemeLoaded &= _Base.Theme.GetColor(_Theme.ColorName, SkinIndex, ref Color);
} }
else else
{ {
@@ -264,10 +261,10 @@ namespace Vocaluxe.Menu
color = MaxColor; color = MaxColor;
} }
CDraw.DrawColor(color, bar); _Base.Drawing.DrawColor(color, bar);
if (Reflection) if (Reflection)
CDraw.DrawColorReflection(color, bar, ReflectionSpace, ReflectionHeight); _Base.Drawing.DrawColorReflection(color, bar, ReflectionSpace, ReflectionHeight);
} }
} }
@@ -278,10 +275,10 @@ namespace Vocaluxe.Menu
public void LoadTextures() public void LoadTextures()
{ {
if (_Theme.ColorName != String.Empty) if (_Theme.ColorName != String.Empty)
Color = CTheme.GetColor(_Theme.ColorName); Color = _Base.Theme.GetColor(_Theme.ColorName);
if (_Theme.MaxColorName != String.Empty) if (_Theme.MaxColorName != String.Empty)
MaxColor = CTheme.GetColor(_Theme.MaxColorName); MaxColor = _Base.Theme.GetColor(_Theme.MaxColorName);
} }
public void ReloadTextures() public void ReloadTextures()
+1
View File
@@ -116,6 +116,7 @@ namespace Vocaluxe.Menu
void DrawTextureReflection(STexture Texture, SRectF Rect, SColorF Color, SRectF Bounds, float ReflectionSpace, float ReflectionHeight); void DrawTextureReflection(STexture Texture, SRectF Rect, SColorF Color, SRectF Bounds, float ReflectionSpace, float ReflectionHeight);
void DrawColor(SColorF Color, SRectF Rect); void DrawColor(SColorF Color, SRectF Rect);
void DrawColorReflection(SColorF Color, SRectF Rect, float Space, float Height);
} }
public interface IGraphics public interface IGraphics