Add themes to edit window, OAB stage info hardcode gray theme

Falki-git · Falki-git · commit 2b7af89c19e2 · 2023-04-26T23:19:09.000+02:00
diff --git a/MicroEngineerProject/MicroEngineer/Managers/MessageManager.cs b/MicroEngineerProject/MicroEngineer/Managers/MessageManager.cs
@@ -88,6 +88,7 @@ private void GameStateEntered(MessageCenterMessage obj)
                     _ui.ShowGuiOAB = Windows.FindAll(w => w is EntryWindow).Cast<EntryWindow>().ToList().Find(w => w.MainWindow == MainWindow.StageInfoOAB).IsEditorActive;
                     _ui.CelestialBodies.GetBodies();
                     _ui.CelestialBodySelectionStageIndex = -1;
+                    Styles.SetActiveTheme(Theme.Gray); // TODO implement other themes in OAB
                 }
             }
         }
diff --git a/MicroEngineerProject/MicroEngineer/Managers/UI.cs b/MicroEngineerProject/MicroEngineer/Managers/UI.cs
@@ -486,35 +486,38 @@ private void DrawEditWindow(int windowIndex)
             GUILayout.EndHorizontal();
 
             var entries = editableWindows[_selectedWindowId].Entries.ToList();
-            foreach (var (entry, index) in entries.Select((entry, index) => (entry, index)))
+            for (int i = 0; i < entries.Count; i++)
             {
-                GUILayout.BeginHorizontal();
-                GUILayout.Label(entry.Name, Styles.NameLabelStyle);
-                GUI.enabled = entry.NumberOfDecimalDigits < 5;
-                if (entry.Formatting != null && GUILayout.Button(Styles.IncreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))
+                GUIStyle backgroundStyle = i == 0 ? Styles.EntryBackground_First : i < entries.Count - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;
+
+                GUILayout.BeginHorizontal(backgroundStyle);
+                
+                GUILayout.Label(entries[i].Name, Styles.NameLabelStyle);
+                GUI.enabled = entries[i].NumberOfDecimalDigits < 5;
+                if (entries[i].Formatting != null && GUILayout.Button(Styles.IncreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))
                 {
-                    entry.NumberOfDecimalDigits++;
+                    entries[i].NumberOfDecimalDigits++;
                 }
-                GUI.enabled = entry.NumberOfDecimalDigits > 0;
-                if (entry.Formatting != null && GUILayout.Button(Styles.DecreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))
+                GUI.enabled = entries[i].NumberOfDecimalDigits > 0;
+                if (entries[i].Formatting != null && GUILayout.Button(Styles.DecreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))
                 {
-                    entry.NumberOfDecimalDigits--;
+                    entries[i].NumberOfDecimalDigits--;
                 }
-                GUI.enabled = index > 0;
+                GUI.enabled = i > 0;
                 if (GUILayout.Button("↑", Styles.OneCharacterBtnStyle))
                 {
-                    editableWindows[_selectedWindowId].MoveEntryUp(index);
+                    editableWindows[_selectedWindowId].MoveEntryUp(i);
                 }
-                GUI.enabled = index < editableWindows[_selectedWindowId].Entries.Count - 1;
+                GUI.enabled = i < editableWindows[_selectedWindowId].Entries.Count - 1;
                 if (GUILayout.Button("↓", Styles.OneCharacterBtnStyle))
                 {
-                    editableWindows[_selectedWindowId].MoveEntryDown(index);
+                    editableWindows[_selectedWindowId].MoveEntryDown(i);
                 }
                 GUI.enabled = true;
                 if (GUILayout.Button("X", Styles.OneCharacterBtnStyle))
-                    editableWindows[_selectedWindowId].RemoveEntry(index);
+                    editableWindows[_selectedWindowId].RemoveEntry(i);
                 GUILayout.EndHorizontal();
-                GUILayout.Space(Styles.NegativeSpacingAfterEntry);
+                GUILayout.Space(-4);
             }
             #endregion
 
@@ -546,35 +549,37 @@ private void DrawEditWindow(int windowIndex)
             }
             GUILayout.EndHorizontal();
 
-            foreach (var (entry, index) in entriesByCategory.Select((entry, index) => (entry, index)))
+            for (int i = 0; i < entriesByCategory.Count; i++)
             {
-                GUILayout.BeginHorizontal();
-                GUILayout.Label(entry.Name, Styles.NameLabelStyle);
+                GUIStyle backgroundStyle = i == 0 ? Styles.EntryBackground_First : i < entriesByCategory.Count - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;
+
+                GUILayout.BeginHorizontal(backgroundStyle);
+                GUILayout.Label(entriesByCategory[i].Name, Styles.NameLabelStyle);
                 if (GUILayout.Button("?", Styles.OneCharacterBtnStyle))
                 {
                     if (!_showTooltip.condition)
-                        _showTooltip = (true, index);
+                        _showTooltip = (true, i);
                     else
                     {
-                        if (_showTooltip.index != index)
-                            _showTooltip = (true, index);
+                        if (_showTooltip.index != i)
+                            _showTooltip = (true, i);
                         else
-                            _showTooltip = (false, index);
+                            _showTooltip = (false, i);
                     }
                 }
                 if (GUILayout.Button("+", Styles.OneCharacterBtnStyle))
                 {
-                    editableWindows[_selectedWindowId].AddEntry(entry);
+                    editableWindows[_selectedWindowId].AddEntry(entriesByCategory[i]);
                 }
                 GUILayout.EndHorizontal();
 
-                if (_showTooltip.condition && _showTooltip.index == index)
+                if (_showTooltip.condition && _showTooltip.index == i)
                 {
                     GUILayout.BeginHorizontal();
-                    GUILayout.Label(entry.Description, Styles.BlueLabelStyle);
+                    GUILayout.Label(entriesByCategory[i].Description, Styles.BlueLabelStyle);
                     GUILayout.EndHorizontal();
                 }
-                GUILayout.Space(Styles.NegativeSpacingAfterEntry);
+                GUILayout.Space(Styles.NegativeSpacingAfterEntry + 7);
             }
             GUILayout.Space(10);
             #endregion
diff --git a/MicroEngineerProject/MicroEngineer/Windows/StageWindow.cs b/MicroEngineerProject/MicroEngineer/Windows/StageWindow.cs
@@ -60,7 +60,7 @@ private void DrawStages(int id)
                     DeltaVStageInfo stageInfo = stages[i];
                     if (stageInfo.DeltaVinVac > 0.0001 || stageInfo.DeltaVatASL > 0.0001)
                     {
-                        GUIStyle style = stageBeingDrawn < numberOfNonEmptyStagesToDraw - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;
+                        GUIStyle style = stageBeingDrawn++ < numberOfNonEmptyStagesToDraw - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;
                         int stageNum = stageCount - stageInfo.Stage;
                         DrawStageEntry(style, stageNum, stageInfo, twrFormatString);
                     }

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ private void GameStateEntered(MessageCenterMessage obj)`
`88`	`88`	`_ui.ShowGuiOAB = Windows.FindAll(w => w is EntryWindow).Cast<EntryWindow>().ToList().Find(w => w.MainWindow == MainWindow.StageInfoOAB).IsEditorActive;`
`89`	`89`	`_ui.CelestialBodies.GetBodies();`
`90`	`90`	`_ui.CelestialBodySelectionStageIndex = -1;`
	`91`	`+ Styles.SetActiveTheme(Theme.Gray); // TODO implement other themes in OAB`
`91`	`92`	`}`
`92`	`93`	`}`
`93`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -486,35 +486,38 @@ private void DrawEditWindow(int windowIndex)`
`486`	`486`	`GUILayout.EndHorizontal();`
`487`	`487`
`488`	`488`	`var entries = editableWindows[_selectedWindowId].Entries.ToList();`
`489`		`- foreach (var (entry, index) in entries.Select((entry, index) => (entry, index)))`
	`489`	`+ for (int i = 0; i < entries.Count; i++)`
`490`	`490`	`{`
`491`		`- GUILayout.BeginHorizontal();`
`492`		`- GUILayout.Label(entry.Name, Styles.NameLabelStyle);`
`493`		`- GUI.enabled = entry.NumberOfDecimalDigits < 5;`
`494`		`- if (entry.Formatting != null && GUILayout.Button(Styles.IncreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))`
	`491`	`+ GUIStyle backgroundStyle = i == 0 ? Styles.EntryBackground_First : i < entries.Count - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;`
	`492`	`+`
	`493`	`+ GUILayout.BeginHorizontal(backgroundStyle);`
	`494`	`+`
	`495`	`+ GUILayout.Label(entries[i].Name, Styles.NameLabelStyle);`
	`496`	`+ GUI.enabled = entries[i].NumberOfDecimalDigits < 5;`
	`497`	`+ if (entries[i].Formatting != null && GUILayout.Button(Styles.IncreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))`
`495`	`498`	`{`
`496`		`- entry.NumberOfDecimalDigits++;`
	`499`	`+ entries[i].NumberOfDecimalDigits++;`
`497`	`500`	`}`
`498`		`- GUI.enabled = entry.NumberOfDecimalDigits > 0;`
`499`		`- if (entry.Formatting != null && GUILayout.Button(Styles.DecreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))`
	`501`	`+ GUI.enabled = entries[i].NumberOfDecimalDigits > 0;`
	`502`	`+ if (entries[i].Formatting != null && GUILayout.Button(Styles.DecreaseDecimalDigitsTexture, Styles.OneCharacterBtnStyle))`
`500`	`503`	`{`
`501`		`- entry.NumberOfDecimalDigits--;`
	`504`	`+ entries[i].NumberOfDecimalDigits--;`
`502`	`505`	`}`
`503`		`- GUI.enabled = index > 0;`
	`506`	`+ GUI.enabled = i > 0;`
`504`	`507`	`if (GUILayout.Button("↑", Styles.OneCharacterBtnStyle))`
`505`	`508`	`{`
`506`		`- editableWindows[_selectedWindowId].MoveEntryUp(index);`
	`509`	`+ editableWindows[_selectedWindowId].MoveEntryUp(i);`
`507`	`510`	`}`
`508`		`- GUI.enabled = index < editableWindows[_selectedWindowId].Entries.Count - 1;`
	`511`	`+ GUI.enabled = i < editableWindows[_selectedWindowId].Entries.Count - 1;`
`509`	`512`	`if (GUILayout.Button("↓", Styles.OneCharacterBtnStyle))`
`510`	`513`	`{`
`511`		`- editableWindows[_selectedWindowId].MoveEntryDown(index);`
	`514`	`+ editableWindows[_selectedWindowId].MoveEntryDown(i);`
`512`	`515`	`}`
`513`	`516`	`GUI.enabled = true;`
`514`	`517`	`if (GUILayout.Button("X", Styles.OneCharacterBtnStyle))`
`515`		`- editableWindows[_selectedWindowId].RemoveEntry(index);`
	`518`	`+ editableWindows[_selectedWindowId].RemoveEntry(i);`
`516`	`519`	`GUILayout.EndHorizontal();`
`517`		`- GUILayout.Space(Styles.NegativeSpacingAfterEntry);`
	`520`	`+ GUILayout.Space(-4);`
`518`	`521`	`}`
`519`	`522`	`#endregion`
`520`	`523`
`@@ -546,35 +549,37 @@ private void DrawEditWindow(int windowIndex)`
`546`	`549`	`}`
`547`	`550`	`GUILayout.EndHorizontal();`
`548`	`551`
`549`		`- foreach (var (entry, index) in entriesByCategory.Select((entry, index) => (entry, index)))`
	`552`	`+ for (int i = 0; i < entriesByCategory.Count; i++)`
`550`	`553`	`{`
`551`		`- GUILayout.BeginHorizontal();`
`552`		`- GUILayout.Label(entry.Name, Styles.NameLabelStyle);`
	`554`	`+ GUIStyle backgroundStyle = i == 0 ? Styles.EntryBackground_First : i < entriesByCategory.Count - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;`
	`555`	`+`
	`556`	`+ GUILayout.BeginHorizontal(backgroundStyle);`
	`557`	`+ GUILayout.Label(entriesByCategory[i].Name, Styles.NameLabelStyle);`
`553`	`558`	`if (GUILayout.Button("?", Styles.OneCharacterBtnStyle))`
`554`	`559`	`{`
`555`	`560`	`if (!_showTooltip.condition)`
`556`		`- _showTooltip = (true, index);`
	`561`	`+ _showTooltip = (true, i);`
`557`	`562`	`else`
`558`	`563`	`{`
`559`		`- if (_showTooltip.index != index)`
`560`		`- _showTooltip = (true, index);`
	`564`	`+ if (_showTooltip.index != i)`
	`565`	`+ _showTooltip = (true, i);`
`561`	`566`	`else`
`562`		`- _showTooltip = (false, index);`
	`567`	`+ _showTooltip = (false, i);`
`563`	`568`	`}`
`564`	`569`	`}`
`565`	`570`	`if (GUILayout.Button("+", Styles.OneCharacterBtnStyle))`
`566`	`571`	`{`
`567`		`- editableWindows[_selectedWindowId].AddEntry(entry);`
	`572`	`+ editableWindows[_selectedWindowId].AddEntry(entriesByCategory[i]);`
`568`	`573`	`}`
`569`	`574`	`GUILayout.EndHorizontal();`
`570`	`575`
`571`		`- if (_showTooltip.condition && _showTooltip.index == index)`
	`576`	`+ if (_showTooltip.condition && _showTooltip.index == i)`
`572`	`577`	`{`
`573`	`578`	`GUILayout.BeginHorizontal();`
`574`		`- GUILayout.Label(entry.Description, Styles.BlueLabelStyle);`
	`579`	`+ GUILayout.Label(entriesByCategory[i].Description, Styles.BlueLabelStyle);`
`575`	`580`	`GUILayout.EndHorizontal();`
`576`	`581`	`}`
`577`		`- GUILayout.Space(Styles.NegativeSpacingAfterEntry);`
	`582`	`+ GUILayout.Space(Styles.NegativeSpacingAfterEntry + 7);`
`578`	`583`	`}`
`579`	`584`	`GUILayout.Space(10);`
`580`	`585`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ private void DrawStages(int id)`
`60`	`60`	`DeltaVStageInfo stageInfo = stages[i];`
`61`	`61`	`if (stageInfo.DeltaVinVac > 0.0001 \|\| stageInfo.DeltaVatASL > 0.0001)`
`62`	`62`	`{`
`63`		`- GUIStyle style = stageBeingDrawn < numberOfNonEmptyStagesToDraw - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;`
	`63`	`+ GUIStyle style = stageBeingDrawn++ < numberOfNonEmptyStagesToDraw - 1 ? Styles.EntryBackground_Middle : Styles.EntryBackground_Last;`
`64`	`64`	`int stageNum = stageCount - stageInfo.Stage;`
`65`	`65`	`DrawStageEntry(style, stageNum, stageInfo, twrFormatString);`
`66`	`66`	`}`