diff --git a/Vocaluxe/Base/CConfig.cs b/Vocaluxe/Base/CConfig.cs index 3f735283..6e347131 100644 --- a/Vocaluxe/Base/CConfig.cs +++ b/Vocaluxe/Base/CConfig.cs @@ -89,6 +89,7 @@ namespace Vocaluxe.Base [DefaultValue(60f)] public float MaxFPS; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn VSync; [DefaultValue(EOffOn.TR_CONFIG_ON)] public EOffOn FullScreen; + [DefaultValue(EOffOn.TR_CONFIG_OFF)] public EOffOn Stretch; [DefaultValue(0.4f), XmlRanged(0, 3)] public float FadeTime; } @@ -468,6 +469,8 @@ namespace Vocaluxe.Base return "Server Encryption On/Off: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))); case "ServerPort": return "Server Port (default: 3000) [1..65535]"; + case "Stretch": + return "Stretch view to full window size: " + CHelper.ListStrings(Enum.GetNames(typeof(EOffOn))); default: return null; } diff --git a/Vocaluxe/Lib/Draw/CDirect3D.cs b/Vocaluxe/Lib/Draw/CDirect3D.cs index 6289f02a..fc58ebb1 100644 --- a/Vocaluxe/Lib/Draw/CDirect3D.cs +++ b/Vocaluxe/Lib/Draw/CDirect3D.cs @@ -207,7 +207,10 @@ namespace Vocaluxe.Lib.Draw _H = _Form.ClientSize.Height; _W = _Form.ClientSize.Width; - _AdjustAspect(false); + if (CConfig.Config.Graphics.Stretch != EOffOn.TR_CONFIG_ON) + { + _AdjustAspect(false); + } //Apply the new sizes to the PresentParameters _PresentParameters.BackBufferWidth = _Form.ClientSize.Width; diff --git a/Vocaluxe/Lib/Draw/COpenGL.cs b/Vocaluxe/Lib/Draw/COpenGL.cs index 4c78c436..46cb7d15 100644 --- a/Vocaluxe/Lib/Draw/COpenGL.cs +++ b/Vocaluxe/Lib/Draw/COpenGL.cs @@ -219,7 +219,11 @@ namespace Vocaluxe.Lib.Draw _W = _Control.Width; _CurrentAlignment = CConfig.Config.Graphics.ScreenAlignment; - _AdjustAspect(true); + if (CConfig.Config.Graphics.Stretch != EOffOn.TR_CONFIG_ON) + { + _AdjustAspect(true); + } + _AdjustNewBorders(); GL.Viewport(_X, _Y, _W, _H); }