Moved initialization of GUIStyles into Start

Made window 70 pixels higher
linuxgurugamer · Feb 19, 2020 · 88a0a3a · 88a0a3a
1 parent eb6b356
commit 88a0a3a
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 16 deletions.
diff --git a/.vs/KRnD/v16/Server/sqlite3/storage.ide b/.vs/KRnD/v16/Server/sqlite3/storage.ide
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,5 +1,9 @@
 Changelog
 
+1.16.0.2
+	Moved initialization of GUIStyles into Start
+	Made window 70 pixels higher, thanks to @leatherneck6017 for the change
+
 1.16.0.1
 	Fixed index out of range 
 

diff --git a/GameData/KRnD/KRnD.version b/GameData/KRnD/KRnD.version
@@ -11,7 +11,7 @@
     "MAJOR": 1,
     "MINOR": 16,
     "PATCH": 0,
-    "BUILD": 1
+    "BUILD": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/KRnD.version b/KRnD.version
@@ -11,7 +11,7 @@
     "MAJOR": 1,
     "MINOR": 16,
     "PATCH": 0,
-    "BUILD": 1
+    "BUILD": 2
   },
   "KSP_VERSION_MIN": {
     "MAJOR": 1,

diff --git a/Source/AssemblyVersion.cs b/Source/AssemblyVersion.cs
@@ -5,4 +5,4 @@
 
  using System.Reflection;
 
- [assembly: AssemblyVersion("1.16.0.1")]
+ [assembly: AssemblyVersion("1.16.0.2")]
diff --git a/Source/KRnDGUI.cs b/Source/KRnDGUI.cs
@@ -17,14 +17,12 @@ namespace KRnD
     [KSPAddon(KSPAddon.Startup.EditorAny, false)]
     public class KRnDGUI : UnityEngine.MonoBehaviour
     {
-        // TODO: The Application-Button shows up during the flight scene ...
-        //private static ApplicationLauncherButton button = null;
         public static Rect windowPosition = new Rect(300, 60, 450, 400);
-        private static GUIStyle windowStyle = new GUIStyle(HighLogic.Skin.window) { fixedWidth = 500f, fixedHeight = 300f };
-        private static GUIStyle labelStyle = new GUIStyle(HighLogic.Skin.label);
-        private static GUIStyle labelStyleSmall = new GUIStyle(HighLogic.Skin.label) { fontSize = 10 };
-        private static GUIStyle buttonStyle = new GUIStyle(HighLogic.Skin.button);
-        private static GUIStyle scrollStyle = new GUIStyle(HighLogic.Skin.scrollView);
+        private static GUIStyle windowStyle;
+        private static GUIStyle labelStyle;
+        private static GUIStyle labelStyleSmall;
+        private static GUIStyle buttonStyle;
+        private static GUIStyle scrollStyle;
         private static Vector2 scrollPos = Vector2.zero;
         // private static Texture2D texture = null;
         private static bool showGui = false;
@@ -40,13 +38,18 @@ public class KRnDGUI : UnityEngine.MonoBehaviour
 
         void Awake()
         {
-
+            windowPosition = new Rect(300, 60, 450, 400);
+            windowStyle = new GUIStyle(HighLogic.Skin.window) { fixedWidth = 500f, fixedHeight = 370 };
+            labelStyle = new GUIStyle(HighLogic.Skin.label);
+            labelStyleSmall = new GUIStyle(HighLogic.Skin.label) { fontSize = 10 };
+            buttonStyle = new GUIStyle(HighLogic.Skin.button);
+            scrollStyle = new GUIStyle(HighLogic.Skin.scrollView);
+            scrollPos = Vector2.zero;
 
             ReadyEvent();
 
         }
 
-        // Fires when a scene is ready so we can install our button.
         public void ReadyEvent()
         {
             if (toolbarControl != null)
@@ -407,7 +410,7 @@ private String getPartInfo(Part part, KRnDUpgrade upgradesToApply = null)
                     for (int i = 0; i < fuelResources.Count; i++)
                     {
                         PartResource fuelResource = fuelResources[i];
-                    
+
                         // Reformat resource-names like "ElectricCharge" to "Electric Charge":
                         String fuelName = fuelResource.resourceName.ToString();
                         fuelName = Regex.Replace(fuelName, @"([a-z])([A-Z])", "$1 $2");
@@ -422,7 +425,7 @@ private String getPartInfo(Part part, KRnDUpgrade upgradesToApply = null)
                     for (int i = 0; i < engineModules.Count; i++)
                     {
                         ModuleEngines engineModule = engineModules[i];
-                    
+
                         info += "<color=#99FF00><b>Engine";
                         if (engineModules.Count > 1) info += " (" + engineModule.engineID.ToString() + ")";
                         info += ":</b></color>\n" + engineModule.GetInfo();
@@ -439,7 +442,7 @@ private String getPartInfo(Part part, KRnDUpgrade upgradesToApply = null)
                     for (int i = 0; i < converterModules.Count; i++)
                     {
                         ModuleResourceConverter converterModule = converterModules[i];
-                    
+
                         info += "<color=#99FF00><b>Converter " + converterModule.ConverterName + ":</b></color>\n" + converterModule.GetInfo() + "\n";
                     }
                 }
@@ -855,7 +858,7 @@ private void OnWindow(int windowId)
                                         if (m.moduleName == "R&D")
                                         {
                                             AvailablePart.ModuleInfo info = m;
-                                            m.info = KRnDModule.GetInfo(part) ;
+                                            m.info = KRnDModule.GetInfo(part);
                                             break;
                                         }
                                     }