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

Merge branch 'develop' into popup-control

Browse Source
This commit is contained in:
Alexander Eckart committed 2012-03-21 16:21:08 +01:00
2 parents c3d737107a f3f7098437
commit faa7ebb964
17 files changed
+564 -392
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Menu/CGraphics.cs
+6 -18
View File
@@ -260,12 +260,9 @@ namespace Vocaluxe.Menu
for (int i = 0; i < _Screens.Count; i++)
{
if (Enum.GetNames(typeof(EScreens))[i] != Enum.GetName(typeof(EScreens), (int)EScreens.ScreenCredits))
{
CLog.StartBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
_Screens[i].LoadTheme();
CLog.StopBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
}
CLog.StartBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
Screens[i].LoadTheme();
CLog.StopBenchmark(1, "Load Theme " + Enum.GetNames(typeof(EScreens))[i]);
}
for (int i = 0; i < _PopupScreens.Count; i++)
@@ -279,10 +276,7 @@ namespace Vocaluxe.Menu
ReloadCursor();
for (int i = 0; i < _Screens.Count; i++)
{
if (Enum.GetNames(typeof(EScreens))[i] != Enum.GetName(typeof(EScreens), (int)EScreens.ScreenCredits))
{
_Screens[i].ReloadTheme();
}
Screens[i].ReloadTheme();
}
for (int i = 0; i < _PopupScreens.Count; i++)
@@ -296,10 +290,7 @@ namespace Vocaluxe.Menu
ReloadCursor();
for (int i = 0; i < _Screens.Count; i++)
{
if (Enum.GetNames(typeof(EScreens))[i] != Enum.GetName(typeof(EScreens), (int)EScreens.ScreenCredits))
{
_Screens[i].ReloadTextures();
}
Screens[i].ReloadTextures();
}
for (int i = 0; i < _PopupScreens.Count; i++)
@@ -313,10 +304,7 @@ namespace Vocaluxe.Menu
CTheme.SaveTheme();
for (int i = 0; i < _Screens.Count; i++)
{
if (Enum.GetNames(typeof(EScreens))[i] != Enum.GetName(typeof(EScreens), (int)EScreens.ScreenCredits))
{
_Screens[i].SaveTheme();
}
Screens[i].SaveTheme();
}
for (int i = 0; i < _PopupScreens.Count; i++)