Rename SetRect to something more appropriate and tune it

Vocaluxe/Base/CDraw.cs

@@ -381,8 +381,7 @@ namespace Vocaluxe.Base
             if (textureRef == null)
                 return;
 
-            SRectF rect;
+            SRectF rect = CHelper.FitInBounds(bounds, textureRef.OrigAspect, aspect);
-            CHelper.SetRect(bounds, out rect, textureRef.OrigAspect, aspect);
             DrawTexture(textureRef, rect, color);
         }
 

VocaluxeLib/CHelper.cs

@@ -78,51 +78,58 @@ namespace VocaluxeLib
             return result;
         }
 
-        public static void SetRect(SRectF bounds, out SRectF rect, float aspectRatio, EAspect aspect)
+        /// <summary>
+        ///     Places a rect within the bounds maintaining the aspectRatio and using the given aspect
+        /// </summary>
+        /// <param name="bounds">Bounds to fit the rect in</param>
+        /// <param name="aspectRatio">The original aspectRatio of the rect/image/...</param>
+        /// <param name="aspect">
+        ///     Crop: Fit fully in bounds cutting off overhanging parts (same on both sides)<br />
+        ///     LetterBox: Fit the long side possibly leaving some space on the other (rect will be centered)<br />
+        ///     StretcH: Just fit the rect in the bounds (rect=bounds)
+        /// </param>
+        public static SRectF FitInBounds(SRectF bounds, float aspectRatio, EAspect aspect)
         {
-            float boundsW = bounds.W;
+            if (aspect == EAspect.Stretch)
-            float boundsH = bounds.H;
+                return bounds;
-            float boundsAspectRatio = boundsW / boundsH;
 
-            float scaledWidth;
+            float boundsAspectRatio = bounds.W / bounds.H;
-            float scaledHeight;
+
+            float scaledWidth, scaledHeight;
 
             switch (aspect)
             {
                 case EAspect.Crop:
                     if (boundsAspectRatio >= aspectRatio)
                     {
-                        scaledWidth = boundsW;
+                        scaledWidth = bounds.W;
-                        scaledHeight = boundsW / aspectRatio;
+                        scaledHeight = bounds.W / aspectRatio;
                     }
                     else
                     {
-                        scaledHeight = boundsH;
+                        scaledHeight = bounds.H;
-                        scaledWidth = boundsH * aspectRatio;
+                        scaledWidth = bounds.H * aspectRatio;
                     }
                     break;
                 case EAspect.LetterBox:
                     if (boundsAspectRatio <= aspectRatio)
                     {
-                        scaledWidth = boundsW;
+                        scaledWidth = bounds.W;
-                        scaledHeight = boundsW / aspectRatio;
+                        scaledHeight = bounds.W / aspectRatio;
                     }
                     else
                     {
-                        scaledHeight = boundsH;
+                        scaledHeight = bounds.H;
-                        scaledWidth = boundsH * aspectRatio;
+                        scaledWidth = bounds.H * aspectRatio;
                     }
                     break;
                 default:
-                    scaledWidth = boundsW;
+                    return bounds;
-                    scaledHeight = boundsH;
-                    break;
             }
+            float left = (bounds.W - scaledWidth) / 2 + bounds.X;
+            float top = (bounds.H - scaledHeight) / 2 + bounds.Y;
 
-            float left = (boundsW - scaledWidth) / 2 + bounds.X;
+            return new SRectF(left, top, scaledWidth, scaledHeight, bounds.Z);
-            float upper = (boundsH - scaledHeight) / 2 + bounds.Y;
-
-            rect = new SRectF(left, upper, scaledWidth, scaledHeight, bounds.Z);
         }
 
         /// <summary>

VocaluxeLib/Menu/CStatic.cs

@@ -196,7 +196,7 @@ namespace VocaluxeLib.Menu
             SRectF rect = Rect.Scale(scale);
             rect.Z += zModify;
             if (texture != null)
-                CHelper.SetRect(rect, out rect, texture.OrigAspect, aspect);
+                rect = CHelper.FitInBounds(rect, texture.OrigAspect, aspect);
 
             var color = new SColorF(Color.R, Color.G, Color.B, Color.A * Alpha);
             if (Visible || forceDraw || (CBase.Settings.GetProgramState() == EProgramState.EditTheme))

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -17,7 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using VocaluxeLib.Draw;
@@ -473,8 +472,7 @@ namespace VocaluxeLib.Menu.SongMenu
             {
                 if (vidtex.Color.A < 1)
                     _CoverBig.Draw(EAspect.Crop);
-                SRectF rect;
+                SRectF rect = CHelper.FitInBounds(_CoverBig.Rect, vidtex.OrigAspect, EAspect.Crop);
-                CHelper.SetRect(_CoverBig.Rect, out rect, vidtex.OrigAspect, EAspect.Crop);
 
                 CBase.Drawing.DrawTexture(vidtex, rect);
                 CBase.Drawing.DrawTextureReflection(vidtex, rect, vidtex.Color, _CoverBig.ReflectionSpace, _CoverBig.ReflectionHeight);