fix layouting

Adam- · Jun 20, 2024 · 0b5129f · 0b5129f
1 parent 0eab5e4
commit 0b5129f
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/Layout.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/Layout.java
@@ -95,7 +95,8 @@ public void addItemAfter(int itemId, int pos)
 	{
 		dirty = true;
 
-		for (int i = pos; i < layout.length; ++i)
+		int i;
+		for (i = pos; i < layout.length; ++i)
 		{
 			if (layout[i] == -1)
 			{
@@ -105,7 +106,7 @@ public void addItemAfter(int itemId, int pos)
 		}
 
 		resize(Math.max(pos + 1, layout.length + 1));
-		layout[pos] = itemId;
+		layout[i] = itemId;
 	}
 
 	public void removeItem(int itemId)

diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/LayoutManager.java b/runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/LayoutManager.java
@@ -577,7 +577,10 @@ public Layout generateLayout(TagTab tab)
 
 					int lpos = base + (pos % 3);
 					int old = l.getItemAtPos(lpos);
-					if (old != -1) removed.add(old);
+					if (old != -1) {
+						log.debug("Moving {}", itemManager.getItemComposition(old).getName());
+						removed.add(old);
+					}
 
 					Item item = e.getItem(format[pos]);
 					if (item != null)
@@ -618,9 +621,23 @@ public Layout generateLayout(TagTab tab)
 				}
 			}
 
+			// Middle row
+			for (int j = 0; j < 5; ++j)
+			{
+				int idx = j*8 + 3;
+
+				int old = l.getItemAtPos(idx);
+				if (old != -1)
+				{
+					removed.add(old);
+					l.setItemAtPos(-1, idx);
+				}
+			}
+
 			int pos = 56;
 			for (int itemId : removed) {
 				if (l.count(itemId) == 0) {
+					log.debug("Adding {} at {}", itemManager.getItemComposition(itemId).getName(), pos);
 					l.addItemAfter(itemId, pos++);
 				}
 			}