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

Merge branch 'develop' into medley

Browse Source
This commit is contained in:
Florian Kuepper committed 2012-11-01 15:34:37 +01:00
2 parents 2115e75717 2a18c12446
commit 53108eeeb6
3 files changed
+12 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Vocaluxe/Base/CFont.cs
+4 -4
View File
@@ -803,10 +803,10 @@ namespace Vocaluxe.Base
writer.WriteElementString("Folder", _Fonts[Index].Folder); writer.WriteElementString("Folder", _Fonts[Index].Folder);
writer.WriteElementString("Outline", _Fonts[Index].Outline.ToString("#0.00")); writer.WriteElementString("Outline", _Fonts[Index].Outline.ToString("#0.00"));
writer.WriteElementString("ColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00")); writer.WriteElementString("OutlineColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00"));
writer.WriteElementString("ColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00")); writer.WriteElementString("OutlineColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00"));
writer.WriteElementString("ColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00")); writer.WriteElementString("OutlineColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00"));
writer.WriteElementString("ColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00")); writer.WriteElementString("OutlineColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00"));
writer.WriteElementString("FileNormal", _Fonts[Index].FileNormal); writer.WriteElementString("FileNormal", _Fonts[Index].FileNormal);
writer.WriteElementString("FileBold", _Fonts[Index].FileBold); writer.WriteElementString("FileBold", _Fonts[Index].FileBold);
Vocaluxe/Menu/CGraphics.cs
+2 -2
View File
@@ -464,7 +464,7 @@ namespace Vocaluxe.Menu
if (PopupPlayerControlAllowed && KeyEvent.Key == Keys.Tab) if (PopupPlayerControlAllowed && KeyEvent.Key == Keys.Tab)
{ {
if (_CurrentPopupScreen == EPopupScreens.NoPopup) if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
ShowPopup(EPopupScreens.PopupPlayerControl); ShowPopup(EPopupScreens.PopupPlayerControl);
else else
HidePopup(EPopupScreens.PopupPlayerControl); HidePopup(EPopupScreens.PopupPlayerControl);
@@ -509,7 +509,7 @@ namespace Vocaluxe.Menu
bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, MouseEvent); bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, MouseEvent);
if (PopupPlayerControlAllowed && isOverPopupPlayerControl) if (PopupPlayerControlAllowed && isOverPopupPlayerControl)
{ {
if (_CurrentPopupScreen == EPopupScreens.NoPopup) if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON)
ShowPopup(EPopupScreens.PopupPlayerControl); ShowPopup(EPopupScreens.PopupPlayerControl);
} }
Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs
+6 -3
View File
@@ -465,8 +465,8 @@ namespace Vocaluxe.Menu.SongMenu
} }
} }
if (_vidtex.color.A < 1)
_CoverBig.Draw(1f, true); _CoverBig.Draw(1f, true);
_TextBG.Draw(); _TextBG.Draw();
if (_vidtex.index != -1 && _Video != -1) if (_vidtex.index != -1 && _Video != -1)
@@ -476,9 +476,12 @@ namespace Vocaluxe.Menu.SongMenu
CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop); CHelper.SetRect(bounds, ref rect, rect.Width / rect.Height, EAspect.Crop);
CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z), CDraw.DrawTexture(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
_vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false); _vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), false);
CDraw.DrawTextureReflection(_vidtex, new SRectF(rect.X, rect.Y, rect.Width, rect.Height, _CoverBig.Rect.Z),
_vidtex.color, new SRectF(bounds.X, bounds.Y, bounds.Width, bounds.Height, 0f), _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);
} }
_Artist.Draw(); _Artist.Draw();
_Title.Draw(); _Title.Draw();