Provide initial scroll position to item lists

Fixes #58 at long last. Will probably be overwritten by the UI rework anyway.
thomotron · Nov 3, 2022 · e809b50 · e809b50
1 parent 98b51b5
commit e809b50
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Client/Source/GUI/Windows and panels/TradeWindow.cs b/Client/Source/GUI/Windows and panels/TradeWindow.cs
@@ -549,7 +549,8 @@ private VerticalFlexContainer GenerateOurOffer()
                 column.Add(
                     GenerateItemList(
                         itemStacks: ourOfferCache,
-                        scrollUpdate: newScrollPos => ourOfferScrollPos = newScrollPos
+                        scrollUpdate: newScrollPos => ourOfferScrollPos = newScrollPos,
+                        initialScrollPos: ourOfferScrollPos
                     )
                 );
             }
@@ -584,7 +585,8 @@ private VerticalFlexContainer GenerateTheirOffer()
                 column.Add(
                     GenerateItemList(
                         itemStacks: theirOfferCache,
-                        scrollUpdate: newScrollPos => theirOfferScrollPos = newScrollPos
+                        scrollUpdate: newScrollPos => theirOfferScrollPos = newScrollPos,
+                        initialScrollPos: theirOfferScrollPos
                     )
                 );
             }
@@ -694,7 +696,7 @@ private VerticalFlexContainer GenerateAvailableItems()
 
             // Stockpile items list
             column.Add(
-                GenerateItemList(filteredItemStacks, newScrollPos => stockpileItemsScrollPos = newScrollPos, true)
+                GenerateItemList(filteredItemStacks, newScrollPos => stockpileItemsScrollPos = newScrollPos, true, stockpileItemsScrollPos)
             );
 
             // Return the generated flex container
@@ -705,10 +707,10 @@ private VerticalFlexContainer GenerateAvailableItems()
         /// Generates a <see cref="VerticalScrollContainer"/> containing an item list within the given container.
         /// </summary>
         /// <param name="itemStacks">Item stacks to draw in the list</param>
-        /// <param name="scrollPos">List scroll position</param>
         /// <param name="scrollUpdate">Action invoked with the scroll position of the item list when it is drawn</param>
         /// <param name="interactive">Whether the item counts should be modifiable by the user</param>
-        private VerticalScrollContainer GenerateItemList(IEnumerable<StackedThings> itemStacks, Action<Vector2> scrollUpdate, bool interactive = false)
+        /// <param name="initialScrollPos">Initial list scroll position</param>
+        private VerticalScrollContainer GenerateItemList(IEnumerable<StackedThings> itemStacks, Action<Vector2> scrollUpdate, bool interactive = false, Vector2 initialScrollPos = default)
         {
             // Create a new flex container as our 'column' to hold each element
             VerticalFlexContainer column = new VerticalFlexContainer(0f);
@@ -739,7 +741,7 @@ private VerticalScrollContainer GenerateItemList(IEnumerable<StackedThings> item
             }
 
             // Return the flex container wrapped in a scroll container
-            return new VerticalScrollContainer(column, scrollUpdate);
+            return new VerticalScrollContainer(column, scrollUpdate, initialScrollPos);
         }
     }
 }