Fixed a bug with rearranging layout for Pistol, and added the ability…

… to save tracker window size.
thezerothcat · Feb 27, 2018 · c2b20e2 · c2b20e2
1 parent f66c1c2
commit c2b20e2
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 55 deletions.
diff --git a/App.config b/App.config
@@ -35,6 +35,12 @@
             <setting name="UpgradeRequired" serializeAs="String">
                 <value>True</value>
             </setting>
+            <setting name="FormWidth" serializeAs="String">
+                <value>320</value>
+            </setting>
+            <setting name="FormHeight" serializeAs="String">
+                <value>605</value>
+            </setting>
         </LMRItemTracker.Properties.Settings>
         <LMRItemTracker.Settings1>
             <setting name="panel1Contents" serializeAs="String">

diff --git a/LaMulanaItemTrackerForm.Designer.cs b/LaMulanaItemTrackerForm.Designer.cs
diff --git a/LaMulanaItemTrackerForm.cs b/LaMulanaItemTrackerForm.cs
@@ -25,6 +25,7 @@ public LaMulanaItemTrackerForm()
             this.chainWhip.VisibleChanged += new System.EventHandler(this.setChainWhipIndex);
             this.flailWhip.VisibleChanged += new System.EventHandler(this.setFlailWhipIndex);
 
+            updateFormSize();
             updateFormColor();
             updateTextColor();
             InitializePossibleItems();
@@ -1720,6 +1721,10 @@ public Control GetControl(String itemName)
             {
                 return bomb;
             }
+            if ("Pistol".Equals(itemName))
+            {
+                return pistol;
+            }
             if ("Philosopher's Ocarina".Equals(itemName))
             {
                 return ocarina;
@@ -1798,6 +1803,12 @@ private String rebuildPanelContents(String currentSettingString, String itemName
             return String.Join(",", itemsInPanel);
         }
 
+        private void updateFormSize()
+        {
+            this.Width = Properties.Settings.Default.FormWidth;
+            this.Height = Properties.Settings.Default.FormHeight;
+        }
+
         private void updateFormColor()
         {
             this.BackColor = Properties.Settings.Default.BackgroundColor;
@@ -1813,6 +1824,8 @@ private void updateTextColor()
 
         private void saveSettings(object sender, EventArgs e)
         {
+            Properties.Settings.Default.FormWidth = this.Width;
+            Properties.Settings.Default.FormHeight = this.Height;
             Properties.Settings.Default.Save();
         }
 
@@ -1825,7 +1838,10 @@ private void restoreDefaultSettings(object sender, EventArgs e)
             Properties.Settings.Default.Panel5Contents = "Philosopher's Ocarina,Mantra/Djed Pillar,Vessel/Medicine,Key Sword,Lamp of Time,Maps,Ankh Jewels";
             Properties.Settings.Default.BackgroundColor = System.Drawing.SystemColors.Control;
             Properties.Settings.Default.TextColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(200)))));
+            Properties.Settings.Default.FormWidth = 320;
+            Properties.Settings.Default.FormHeight = 605;
 
+            updateFormSize();
             updateFormColor();
             updateTextColor();
             InitializeFormPanels();

diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/Properties/Settings.settings b/Properties/Settings.settings
@@ -26,5 +26,11 @@
     <Setting Name="UpgradeRequired" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">True</Value>
     </Setting>
+    <Setting Name="FormWidth" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">320</Value>
+    </Setting>
+    <Setting Name="FormHeight" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">605</Value>
+    </Setting>
   </Settings>
 </SettingsFile>