diff --git a/Vocaluxe/Base/CFont.cs b/Vocaluxe/Base/CFont.cs index 97fcd8a4..0e13f8e2 100644 --- a/Vocaluxe/Base/CFont.cs +++ b/Vocaluxe/Base/CFont.cs @@ -803,10 +803,10 @@ namespace Vocaluxe.Base writer.WriteElementString("Folder", _Fonts[Index].Folder); writer.WriteElementString("Outline", _Fonts[Index].Outline.ToString("#0.00")); - writer.WriteElementString("ColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00")); - writer.WriteElementString("ColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00")); - writer.WriteElementString("ColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00")); - writer.WriteElementString("ColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00")); + writer.WriteElementString("OutlineColorR", _Fonts[Index].OutlineColor.R.ToString("#0.00")); + writer.WriteElementString("OutlineColorG", _Fonts[Index].OutlineColor.G.ToString("#0.00")); + writer.WriteElementString("OutlineColorB", _Fonts[Index].OutlineColor.B.ToString("#0.00")); + writer.WriteElementString("OutlineColorA", _Fonts[Index].OutlineColor.A.ToString("#0.00")); writer.WriteElementString("FileNormal", _Fonts[Index].FileNormal); writer.WriteElementString("FileBold", _Fonts[Index].FileBold); diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs index d0363134..d7543aac 100644 --- a/Vocaluxe/Menu/CGraphics.cs +++ b/Vocaluxe/Menu/CGraphics.cs @@ -464,7 +464,7 @@ namespace Vocaluxe.Menu if (PopupPlayerControlAllowed && KeyEvent.Key == Keys.Tab) { - if (_CurrentPopupScreen == EPopupScreens.NoPopup) + if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) ShowPopup(EPopupScreens.PopupPlayerControl); else HidePopup(EPopupScreens.PopupPlayerControl); @@ -509,7 +509,7 @@ namespace Vocaluxe.Menu bool isOverPopupPlayerControl = CHelper.IsInBounds(_PopupScreens[(int)EPopupScreens.PopupPlayerControl].ScreenArea, MouseEvent); if (PopupPlayerControlAllowed && isOverPopupPlayerControl) { - if (_CurrentPopupScreen == EPopupScreens.NoPopup) + if (_CurrentPopupScreen == EPopupScreens.NoPopup && CConfig.BackgroundMusic == EOffOn.TR_CONFIG_ON) ShowPopup(EPopupScreens.PopupPlayerControl); } diff --git a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs index 89078c54..42c3d9f4 100644 --- a/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs +++ b/Vocaluxe/Menu/SongMenu/CSongMenuTileBoard.cs @@ -465,8 +465,8 @@ namespace Vocaluxe.Menu.SongMenu } } - - _CoverBig.Draw(1f, true); + if (_vidtex.color.A < 1) + _CoverBig.Draw(1f, true); _TextBG.Draw(); 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); 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(); _Title.Draw();