Merge pull request #33 from a1xd/1.1

1.1
a1xd · Oct 9, 2020 · f4c04b4 · f4c04b4
2 parents f7f598f + bcacf97
commit f4c04b4
Show file tree

Hide file tree

Showing 20 changed files with 1,382 additions and 1,268 deletions.
diff --git a/doc/Guide.md b/doc/Guide.md
@@ -1,7 +1,9 @@
 # Raw Accel Guide
 
 ## Installation
-Run `installer.exe` in the release directory to install the Raw Accel driver. Restart your computer for the installation to take effect.  
+
+Run `installer.exe` in the release directory to install the Raw Accel driver. Restart your computer for the installation to take effect.
+* If you encounter a `VCRUNTIME` related system error, [download and install the latest version from Microsoft.](https://aka.ms/vs/16/release/vc_redist.x64.exe)
 
 Run `uninstaller.exe` in the release directory to uninstall the driver. Restart for the uninstallation to take effect.
 

diff --git a/grapher/Constants/Constants.cs b/grapher/Constants/Constants.cs
@@ -58,7 +58,9 @@ public static class Constants
         public const int NarrowChartLeft = 482;
 
         /// <summary> Vertical placement of write button above bottom of sensitivity graph </summary>
-        public const int WriteButtonVerticalOffset = 80;
+        public const int ButtonVerticalOffset = 60;
+
+        public const float SmallButtonSizeFactor = 0.666f;
 
         /// <summary> Format string for shortened x and y textboxes. </summary>
         public const string ShortenedFormatString = "0.###";
@@ -84,9 +86,12 @@ public static class Constants
         /// <summary> Default text to be displayed on write button. </summary>
         public const string WriteButtonDefaultText = "Apply";
 
-        /// <summary> Default text to be displayed on write button. </summary>
-        public const string WriteButtonDelayText = "Delay";
+        /// <summary> Default text to be displayed on toggle button. </summary>
+        public const string ToggleButtonDefaultText = "Toggle";
 
+        /// <summary> Default text to be displayed on button delay. </summary>
+        public const string ButtonDelayText = "Delay";
+
         /// <summary> Title of sensitivity chart. </summary>
         public const string SensitivityChartTitle = "Sensitivity";
 
@@ -112,6 +117,9 @@ public static class Constants
         /// <summary> Color of font in active value labels. </summary>
         public static readonly Color ActiveValueFontColor = Color.FromArgb(255, 65, 65, 65);
 
+        public static readonly Point Origin = new Point(0);
+        public static readonly Size MaxSize = new Size(9999, 9999);
+
         #endregion ReadOnly
     }
 }
diff --git a/grapher/Form1.Designer.cs b/grapher/Form1.Designer.cs
diff --git a/grapher/Form1.cs b/grapher/Form1.cs
@@ -50,6 +50,7 @@ public RawAcceleration()
                 accelTypeDropX,
                 accelTypeDropY,
                 writeButton,
+                toggleButton,
                 showVelocityGainToolStripMenuItem,
                 showLastMouseMoveToolStripMenuItem,
                 wholeVectorToolStripMenuItem,
@@ -58,7 +59,6 @@ public RawAcceleration()
                 legacyCapToolStripMenuItem,
                 gainOffsetToolStripMenuItem,
                 legacyOffsetToolStripMenuItem,
-                AutoWriteMenuItem,
                 ScaleMenuItem,
                 DPITextBox,
                 PollRateTextBox,
@@ -155,11 +155,35 @@ private void Form1_Load(object sender, EventArgs e)
 
         }
 
+        public void ResetAutoScroll()
+        {
+            chartsPanel.AutoScrollPosition = Constants.Origin;
+        }
+
+        public void DoResize()
+        {
+            ResetAutoScroll();
+
+            var workingArea = Screen.PrimaryScreen.WorkingArea;
+            var chartsPreferredSize = chartsPanel.GetPreferredSize(Constants.MaxSize);
+
+            Size = new Size
+            {
+                Width = Math.Min(workingArea.Width - Location.X, optionsPanel.Size.Width + chartsPreferredSize.Width),
+                Height = Math.Min(workingArea.Height - Location.Y, chartsPreferredSize.Height + 48)
+            };
+        }
+
         private void RawAcceleration_Paint(object sender, PaintEventArgs e)
         {
             //AccelGUI.AccelCharts.DrawLastMovement();
         }
 
         #endregion Method
+
+        private void optionsPanel_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 }
diff --git a/grapher/Layouts/DefaultLayout.cs b/grapher/Layouts/DefaultLayout.cs
@@ -9,7 +9,6 @@ public DefaultLayout()
         {
             Name = "Default";
             Index = (int)AccelMode.noaccel;
-            ButtonEnabled = false;
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(true, Acceleration);

diff --git a/grapher/Layouts/LayoutBase.cs b/grapher/Layouts/LayoutBase.cs
@@ -26,7 +26,6 @@ public LayoutBase()
             ExponentLayout = new OptionLayout(false, string.Empty);
             MidpointLayout = new OptionLayout(false, string.Empty);
 
-            ButtonEnabled = true;
             LogarithmicCharts = false;
         }
 
@@ -40,8 +39,6 @@ public LayoutBase()
 
         public bool LogarithmicCharts { get; protected set; }
 
-        protected bool ButtonEnabled { get; set; }
-
         protected OptionLayout AccelLayout { get; set; }
 
         protected OptionLayout ScaleLayout { get; set; }
@@ -70,7 +67,6 @@ public void Layout(
             Button button,
             int top)
         {
-            button.Enabled = ButtonEnabled;
 
             IOption previous = null;
 

diff --git a/grapher/Layouts/OffLayout.cs b/grapher/Layouts/OffLayout.cs
@@ -9,7 +9,6 @@ public OffLayout()
         {
             Name = "Off";
             Index = (int)AccelMode.noaccel;
-            ButtonEnabled = true;
             LogarithmicCharts = false;
 
             AccelLayout = new OptionLayout(false, string.Empty);