Merge pull request #50 from Mu0n/master

Fixed a conflict with the form designer (scaling menus).

Thanks for your contribution.

.gitignore

@@ -12,3 +12,4 @@ Tests/*.lst
 bin/Debug
 bin/Release
 packages
+UpgradeLog.htm

Main/Display/Gpu.cs

@@ -36,8 +36,11 @@ public unsafe partial class Gpu : UserControl
         private static readonly int[] vs = new int[256 * 8];
         private int[] lutCache = vs;
 
+
+        //NativeHeight and NativeWidth are no longer used in this fork proposition
         public const int NativeHeight = 480;
-        public const int NativeWidth = 768;
+        public const int NativeWidth = 640;
+
         private int MarginHeight;
         private int MarginWidth;
 
@@ -85,10 +88,10 @@ public void SetViewSize(int viewWidth, int viewHeight)
             ParentForm.Width = viewWidth + MarginWidth;
         }
 
-        public void SetViewScaling(float scaling)
+        public void SetViewScaling(float scaling, int requiredWidth, int requiredHeight)
         {
-            int viewHeight = (int)Math.Ceiling((float)NativeHeight * scaling);
-            int viewWidth = (int)Math.Ceiling((float)NativeWidth * scaling);
+            int viewHeight = (int)((float)requiredHeight * scaling);
+            int viewWidth = (int)((float)requiredWidth * scaling);
 
             ParentForm.Height = viewHeight + MarginHeight;
             ParentForm.Width = viewWidth + MarginWidth;

Main/UI/MainWindow.cs

@@ -1898,22 +1898,40 @@ private void MIDIToVGMConvertToolStripMenuItem_Click(object sender, EventArgs e)
             midiForm.Show();
         }
 
-        private void scale1_0XToolStripMenuItem_Click(object sender, EventArgs e)
+        private void scale1_0X_H480ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             this.WindowState = FormWindowState.Normal;
-            gpu.SetViewScaling(1.0f);
+            gpu.SetViewScaling(1.0f, 640, 480);
         }
 
-        private void scale1_5XToolStripMenuItem_Click(object sender, EventArgs e)
+        private void scale1_5X_H480ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             this.WindowState = FormWindowState.Normal;
-            gpu.SetViewScaling(1.5f);
+            gpu.SetViewScaling(1.5f, 640, 480);
         }
 
-        private void scale2_0XToolStripMenuItem_Click(object sender, EventArgs e)
+        private void scale2_0X_H480ToolStripMenuItem_Click(object sender, EventArgs e)
         {
             this.WindowState = FormWindowState.Normal;
-            gpu.SetViewScaling(2.0f);
+            gpu.SetViewScaling(2.0f, 640, 480);
+        }
+
+        private void scale1_0X_H400ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Normal;
+            gpu.SetViewScaling(1.0f, 640, 400);
+        }
+
+        private void scale1_5X_H400ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Normal;
+            gpu.SetViewScaling(1.5f, 640, 400);
+        }
+
+        private void scale2_0X_H400ToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            this.WindowState = FormWindowState.Normal;
+            gpu.SetViewScaling(2.0f, 640, 400);
         }
     }
 }