Fixed edit window exception + version increment.

ISOR3X · Apr 22, 2024 · ca202de · ca202de
1 parent 16cfc54
commit ca202de
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 15 deletions.
diff --git a/About/About.xml b/About/About.xml
@@ -6,7 +6,7 @@
     <li>1.5</li>
   </supportedVersions>
   <packageId>ISOREX.PawnEditor</packageId>
-  <modVersion>1.0.4-dev</modVersion>
+  <modVersion>1.0.5</modVersion>
   <modDependencies>
     <li>
       <packageId>brrainz.harmony</packageId>

diff --git a/Assemblies/PawnEditor.dll b/Assemblies/PawnEditor.dll
diff --git a/Languages/English/Keyed/UI.xml b/Languages/English/Keyed/UI.xml
@@ -32,7 +32,7 @@
     <!-- Selection -->
     <PawnEditor.Selected>selected</PawnEditor.Selected>
     <PawnEditor.Colony>colony</PawnEditor.Colony>
-    <PawnEditor.Selection>selection</PawnEditor.Selection>
+    <PawnEditor.StartingPreset>starting preset</PawnEditor.StartingPreset>
 
     <!-- Load and Randomize -->
     <PawnEditor.LoadPawn>Load pawn</PawnEditor.LoadPawn>
@@ -82,7 +82,7 @@
     <PawnEditor.ShowHeadgear>Show headgear</PawnEditor.ShowHeadgear>
     <PawnEditor.ShowApparel>Show apparel</PawnEditor.ShowApparel>
 
-	
+
     <!-- Name and Hitpoints -->
     <PawnEditor.Name>Name</PawnEditor.Name>
     <PawnEditor.Hitpoints>Hitpoints</PawnEditor.Hitpoints>

diff --git a/Source/PawnEditor/Dialogs/Dialog_ColorPicker.cs b/Source/PawnEditor/Dialogs/Dialog_ColorPicker.cs
@@ -26,8 +26,6 @@ public class Dialog_ColorPicker : Window
     private Color _selectedColor;
 
     private Color _textfieldColorBuffer;
-    private string _hexfieldStringBuffer;
-
     public Dialog_ColorPicker(Action<Color> onSelect, ColorType colorType, Color oldColor)
     {
         _onSelect = onSelect;

diff --git a/Source/PawnEditor/Dialogs/EditMenus/Dialog_EditItem.cs b/Source/PawnEditor/Dialogs/EditMenus/Dialog_EditItem.cs
@@ -40,6 +40,12 @@ public override void SetInitialSizeAndPosition()
         setPosition = false;
     }
 
+    public override void PostClose()
+    {
+        base.PostClose();
+        listing.ClearCache();
+    }
+
     protected abstract void DoContents(Listing_Horizontal listing);
 
     public override void DoWindowContents(Rect inRect)

diff --git a/Source/PawnEditor/Properties/AssemblyInfo.cs b/Source/PawnEditor/Properties/AssemblyInfo.cs
@@ -5,11 +5,11 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("PawnEditor")]
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyDescription("A mod for RimWorld that allows you to edit pawns.")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("isorex")]
 [assembly: AssemblyProduct("PawnEditor")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright ©  2024")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -31,5 +31,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4")]
-[assembly: AssemblyFileVersion("1.0.4")]
+[assembly: AssemblyVersion("1.0.5")]
+[assembly: AssemblyFileVersion("1.0.5")]
diff --git a/Source/PawnEditor/Tabs/Humanlike/TabWorker_Social.cs b/Source/PawnEditor/Tabs/Humanlike/TabWorker_Social.cs
@@ -48,7 +48,11 @@ static void DoRomance(Pawn initiator, Pawn recipient)
                              .AllCaravansAndTravelingTransportPods_Alive;
 
                     Find.WindowStack.Add(new FloatMenu(pawns.Where(p => p.RaceProps.Humanlike)
-                       .Select(p => new FloatMenuOption(p.LabelCap, () => DoRomance(pawn, p)))
+                       .Select(p => new FloatMenuOption(p.LabelCap, () =>
+                       {
+                           DoRomance(pawn, p);
+                           table.ClearCache();
+                       }))
                        .ToList()));
                     // ToDo: Add success message
                 })

diff --git a/Source/PawnEditor/UI/PawnEditorUI.cs b/Source/PawnEditor/UI/PawnEditorUI.cs
@@ -239,7 +239,7 @@ private static IEnumerable<SaveLoadItem> GetSaveLoadItems()
         }
 
         if (Pregame)
-            yield return new SaveLoadItem<StartingThingsManager.StartingPreset>("PawnEditor.Selection".Translate(), new());
+            yield return new SaveLoadItem<StartingThingsManager.StartingPreset>("PawnEditor.StartingPreset".Translate().CapitalizeFirst(), new());
         else
             yield return new SaveLoadItem<Map>("PawnEditor.Colony".Translate(), Find.CurrentMap, new()
             {

diff --git a/Source/PawnEditor/Utils/RimUI/Listing_Horizontal.cs b/Source/PawnEditor/Utils/RimUI/Listing_Horizontal.cs
@@ -19,8 +19,8 @@ public class Listing_Horizontal
     public Rect ListingRect;
     public float curHeight;
 
-    private readonly List<ListingCell> _cells = new();
-    private readonly List<Rect> _cachedRects = new();
+    private List<ListingCell> _cells = new();
+    private List<Rect> _cachedRects = new();
     public List<Rect> Rects = new();
 
     private int _cellIndex;
@@ -47,12 +47,22 @@ public void End()
         if (Rects.NullOrEmpty())
         {
             if (_rowWidth > 0) CacheCurrentRow(); // Cache final row
-            Rects = _cachedRects;
+            Rects = _cachedRects.ListFullCopy();
         }
 
         Text.Anchor = TextAnchor.UpperLeft;
         Widgets.EndGroup();
     }
+
+    public void ClearCache()
+    {
+        _cells.Clear();
+        _cachedRects.Clear();
+        Rects.Clear();
+        _rowWidth = 0;
+        curHeight = 0;
+        _maxLabelWidth = 0;
+    }
 
     public Rect GetRect(int relativeWidth = -1, float height = DefaultRowHeight, bool grow = true)
     {