Arreglado error de sobrepasar la altura máxima de la consola

josago97 · Nov 15, 2022 · 4b6f9d1 · 4b6f9d1
1 parent f9b4fc7
commit 4b6f9d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/ConsoleMediaPlayer.Common/ConsoleHelper.cs b/ConsoleMediaPlayer.Common/ConsoleHelper.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
+using System.Runtime.InteropServices;
 
 namespace ConsoleMediaPlayer.Common
 {
@@ -63,9 +58,9 @@ public static FontInfo[] SetCurrentFont(short fontSize = 0)
                 // Get some settings from current font.
                 if (!SetCurrentConsoleFontEx(ConsoleOutputHandle, false, ref set))
                 {
-                    var ex = Marshal.GetLastWin32Error();
-                    Console.WriteLine("Set error " + ex);
-                    throw new System.ComponentModel.Win32Exception(ex);
+                    int error = Marshal.GetLastWin32Error();
+                    Console.WriteLine("Set error " + error);
+                    throw new System.ComponentModel.Win32Exception(error);
                 }
 
                 FontInfo after = new FontInfo
@@ -78,9 +73,9 @@ public static FontInfo[] SetCurrentFont(short fontSize = 0)
             }
             else
             {
-                var er = Marshal.GetLastWin32Error();
-                Console.WriteLine("Get error " + er);
-                throw new System.ComponentModel.Win32Exception(er);
+                int error = Marshal.GetLastWin32Error();
+                Console.WriteLine("Get error " + error);
+                throw new System.ComponentModel.Win32Exception(error);
             }
         }
     }

diff --git a/ConsoleMediaPlayer.Common/MediaPlayer.cs b/ConsoleMediaPlayer.Common/MediaPlayer.cs
@@ -4,6 +4,7 @@ namespace ConsoleMediaPlayer.Common
 {
     public abstract class MediaPlayer
     {
+        static readonly Size MARGIN = new Size(1, 2);
         protected abstract short FontSize { get; }
         public string FilePath { get; init; }
         public Size Resolution { get; protected set; }
@@ -20,16 +21,19 @@ public MediaPlayer(string filePath)
         public void ResizeConsoleScreen()
         {
             ConsoleHelper.SetCurrentFont(FontSize);
-            Console.SetWindowSize(Resolution.Width + 1, Resolution.Height + 2);
+            int width = Resolution.Width + MARGIN.Width;
+            int height = Resolution.Height + MARGIN.Height;
+            Console.SetWindowSize(width, height);
         }
 
         protected Size CalculateResolution(Size originalResolution, int desiredHeight)
         {
             double aspectRatio = originalResolution.Width / (double)originalResolution.Height;
-            int width = (int)(desiredHeight * aspectRatio);
-            int height = desiredHeight / 2;
+            int maxWindowHeight = Console.LargestWindowHeight - MARGIN.Height;
+            int height = Math.Min(maxWindowHeight * 2, desiredHeight);
+            int width = (int)(height * aspectRatio);
 
-            return new Size(width, height);
+            return new Size(width, height / 2);
         }
 
     }