Merge pull request #15 from Falki-git/main

Support for SpaceWarp 1.1.0

Author: Falki-git

MicroEngineerProject/MicroEngineer/MicroEngineerMod.cs

@@ -303,23 +303,24 @@ private void FillMainGUI(int windowID)
                     CloseWindow();
                 }
 
-                GUILayout.Space(10);
+                GUILayout.Space(5);
 
                 GUILayout.BeginHorizontal();
 
+                int toggleIndex = -1;
                 // Draw toggles for all windows except MainGui and StageInfoOAB
-                foreach (var (window, index) in MicroWindows.Select((window, index) => (window, index)).Where(x => x.window.MainWindow != MainWindow.MainGui && x.window.MainWindow != MainWindow.StageInfoOAB))
+                foreach (MicroWindow window in MicroWindows.Where(x => x.MainWindow != MainWindow.MainGui && x.MainWindow != MainWindow.StageInfoOAB))
                 {
                     // layout can fit 6 toggles, so if all 6 slots are filled then go to a new line. Index == 0 is the MainGUI which isn't rendered
-                    if ((index - 1) % 6 == 0 && index > 1)
+                    if (++toggleIndex % 6 == 0 && toggleIndex > 0)
                     {
                         GUILayout.EndHorizontal();
                         GUILayout.BeginHorizontal();
                     }
                     window.IsFlightActive = GUILayout.Toggle(window.IsFlightActive, window.Abbreviation, MicroStyles.SectionToggleStyle);
-                    GUILayout.Space(26);
                 }
                 GUILayout.EndHorizontal();
+                GUILayout.Space(5);
 
                 // Draw Settings window first
                 int settingsIndex = MicroWindows.FindIndex(window => window.MainWindow == MainWindow.Settings);

MicroEngineerProject/MicroEngineer/MicroStyles.cs

@@ -101,7 +101,8 @@ public static void InitializeStyles()
 
             SectionToggleStyle = new GUIStyle(SpaceWarpUISkin.toggle)
             {
-                padding = new RectOffset(14, 0, 3, 3)
+                padding = new RectOffset(0, 18, -5, 0),
+                contentOffset= new Vector2(17, 8)
             };
 
             NameLabelStyle = new GUIStyle(SpaceWarpUISkin.label);

Staging/BepInEx/plugins/micro_engineer/swinfo.json

@@ -9,7 +9,7 @@
 		{
 		  "id":  "SpaceWarp",
 		  "version": {
-			"min": "1.0.1",
+			"min": "1.1.0",
 			"max": "*"
 		  }
 		}