Merge pull request #288 from JacobPalecki/1.7bugfixStyle

1.7.0 bugfix follow-up: Style edits and remove dpi awareness

Author: JacobPalecki

grapher/App.config

@@ -5,9 +5,9 @@
             <section name="grapher.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
-	<System.Windows.Forms.ApplicationConfigurationSection>
+	<!--<System.Windows.Forms.ApplicationConfigurationSection>
 		<add key="DpiAwareness" value="PerMonitorV2" />
-	</System.Windows.Forms.ApplicationConfigurationSection>
+	</System.Windows.Forms.ApplicationConfigurationSection>-->
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
     </startup>
@@ -19,9 +19,9 @@
                 <setting name="Size" serializeAs="String">
                         <value>930, 990</value>
                 </setting>
-			    <setting name="HasRunBefore" serializeAs="String">
-			    	    <value>False</value>
-			    </setting>
+                <setting name="HasRunBefore" serializeAs="String">
+                        <value>False</value>
+                </setting>
         </grapher.Properties.Settings>
     </userSettings>
 </configuration>

grapher/Form1.cs

@@ -388,27 +388,31 @@ private void RawAcceleration_Shown(object sender, EventArgs e)
         {
             var sizeDirect = chartsPanel.GetPreferredSize(Constants.MaxSize);
             Console.WriteLine($"[BeginInvoke] Direct size: {sizeDirect}");
+
             if (Properties.Settings.Default.HasRunBefore)
             {
-                var rect = new Rectangle(Properties.Settings.Default.Location, Properties.Settings.Default.Size);
-                bool isVisible = Screen.AllScreens.Any(s => s.WorkingArea.IntersectsWith(rect));
-                if (isVisible)
+                var savedSettingsRect = new Rectangle(Properties.Settings.Default.Location, Properties.Settings.Default.Size);
+                bool isSavedSettingsVisible = Screen.AllScreens.Any(s => s.WorkingArea.IntersectsWith(savedSettingsRect));
+                if (isSavedSettingsVisible)
+                {
+                    //this.Location = Properties.Settings.Default.Location;
+                    //this.Size = Properties.Settings.Default.Size;
+                }
+                else
                 {
-                    this.Location = Properties.Settings.Default.Location;
-                    this.Size = Properties.Settings.Default.Size;
+                    ResizeAndCenter();
                 }
             }
-
             else
             {
                 Properties.Settings.Default.HasRunBefore = true;
                 Properties.Settings.Default.Save();
-                this.BeginInvoke(new MethodInvoker(() =>
+                IAsyncResult result = this.BeginInvoke(new MethodInvoker(() =>
                 {
                     ResizeAndCenter();
                 }));
+                this.EndInvoke(result);
             }
-            
         }
     }
 }

grapher/Properties/Settings.Designer.cs

@@ -8,5 +8,8 @@
     <Setting Name="Size" Type="System.Drawing.Size" Scope="User">
       <Value Profile="(Default)">930, 990</Value>
     </Setting>
+    <Setting Name="HasRunBefore" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
   </Settings>
 </SettingsFile>