Fixed errors and modified Borderless() syntax

Author: ollelogdahl

Examples/Example_3D.cs

@@ -39,7 +39,7 @@ static void Main(string[] args) {
 		public override void Create() {
 			Engine.SetPalette(Palettes.Pico8);
 			Engine.SetBackground(0);
-			Engine.Borderless(true);
+			Engine.Borderless();
 
 			Console.Title = "3D Demo";
 

Examples/Tetris.cs

@@ -31,7 +31,7 @@ private static void Main(string[] args) {
 		}
 		public override void Create() {
 			Engine.SetPalette(Palettes.Pico8);
-			Engine.Borderless(true);
+			Engine.Borderless();
 			Console.Title = "Tetris";
 			TargetFramerate = 16;
 

Source/ConsoleEngine.cs

@@ -40,6 +40,10 @@ public ConsoleEngine(int width, int height, int fontW, int fontH) {
 
 			Console.Title = "Untitled console application";
 			Console.CursorVisible = false;
+
+			// sätter fönstret och bufferns storlek
+			// buffern måste sättas efter fönsret, eftersom den aldrig får vara mindre än skärmen
+			Console.SetWindowSize(width, height);
 			Console.SetBufferSize(width, height);
 
 			ConsoleBuffer = new ConsoleBuffer(width, height);
@@ -56,12 +60,9 @@ public ConsoleEngine(int width, int height, int fontW, int fontH) {
 			// Stänger av alla standard ConsoleInput metoder (Quick-edit etc)
 			NativeMethods.SetConsoleMode(stdInputHandle, 0x0080);
 
-			// Sätter fontstorlek och tvingar Raster (Terminal)
+			// Sätter fontstorlek och tvingar Raster (Terminal) / Consolas
 			// Detta måste göras efter SetBufferSize, annars ger den en IOException
 			ConsoleFont.SetFont(stdOutputHandle, (short)fontW, (short)fontH);
-			// sätter storleken på fönstret, måste ske efter SetBufferSize för annars
-			// blir fönstret 1 px större (?)
-			Console.SetWindowSize(width, height);
 		}
 
 		// Rita
@@ -104,13 +105,11 @@ public void DisplayBuffer() {
 			ConsoleBuffer.Blit();
 		}
 
-		/// <summary> Sets wheather the window should be borderless or not. </summary>
-		/// <param name="b">True if intended to run borderless.</param>
-		public void Borderless(bool b) {
-			IsBorderless = b;
+		/// <summary> Sets the window to borderless mode. </summary>
+		public void Borderless() {
+			IsBorderless = true;
 
 			int GWL_STYLE = -16;                // hex konstant för stil-förändring
-			int WS_DEFAULT = 0x00C00000;        // vanlig
 			int WS_BORDERLESS = 0x00080000;     // helt borderless
 
 			NativeMethods.Rect rect = new NativeMethods.Rect();
@@ -125,13 +124,8 @@ public void Borderless(bool b) {
 				(desktopRect.Right / 2) - ((WindowSize.X * FontSize.X) / 2),
 				(desktopRect.Bottom / 2) - ((WindowSize.Y * FontSize.Y) / 2));
 
-			if (b == true) {
-				NativeMethods.SetWindowLong(consoleHandle, GWL_STYLE, WS_BORDERLESS);
-				NativeMethods.SetWindowPos(consoleHandle, -2, wPos.X, wPos.Y, rect.Right - 8, rect.Bottom - 8, 0x0040);
-			} else {
-				NativeMethods.SetWindowLong(consoleHandle, GWL_STYLE, WS_DEFAULT);
-				NativeMethods.SetWindowPos(consoleHandle, -2, wPos.X, wPos.Y, rect.Right, rect.Bottom, 0x0040);
-			}
+			NativeMethods.SetWindowLong(consoleHandle, GWL_STYLE, WS_BORDERLESS);
+			NativeMethods.SetWindowPos(consoleHandle, -2, wPos.X, wPos.Y, rect.Right - 8, rect.Bottom - 8, 0x0040);
 
 			NativeMethods.DrawMenuBar(consoleHandle);
 		}

Source/ConsoleFont.cs

@@ -19,7 +19,8 @@ internal static int SetFont(IntPtr h, short sizeX, short sizeY) {
 			cfi.dwFontSize.Y = sizeY;
 
 			// sätter font till Terminal (Raster)
-			cfi.FaceName = "Terminal";
+			if (sizeX < 4 || sizeY < 4) cfi.FaceName = "Consolas";
+			else cfi.FaceName = "Terminal";
 
 			NativeMethods.SetCurrentConsoleFontEx(h, false, ref cfi);
 			return 0;