ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

bank tags: Fix tag tab tab scroll height (#13761)

Browse Source
This commit is contained in:
geheur
2021-09-07 11:19:15 -07:00
committed by GitHub
parent 58fb78ff00
commit 03e51acf08
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
runelite-client/src/main/java/net/runelite/client/plugins/banktags/BankTagsPlugin.java
View File

@@ -495,12 +495,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
return; return;
} }
if (event.getScriptId() != ScriptID.BANKMAIN_BUILD || !config.removeSeparators()) if (event.getScriptId() != ScriptID.BANKMAIN_BUILD)
{
return;
}
if (!tabInterface.isActive())
{ {
return; return;
} }
@@ -511,6 +506,20 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
return; return;
} }
if (tabInterface.isTagTabActive())
{
int numTabs = (int) Arrays.stream(itemContainer.getDynamicChildren())
.filter(child -> child.getItemId() != -1 && !child.isHidden())
.count();
updateBankContainerScrollHeight(numTabs);
return;
}
if (!tabInterface.isActive() || !config.removeSeparators())
{
return;
}
int items = 0; int items = 0;
Widget[] containerChildren = itemContainer.getDynamicChildren(); Widget[] containerChildren = itemContainer.getDynamicChildren();
@@ -550,10 +559,15 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
} }
} }
final Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER); updateBankContainerScrollHeight(items);
}
private void updateBankContainerScrollHeight(int items)
{
Widget bankItemContainer = client.getWidget(WidgetInfo.BANK_ITEM_CONTAINER);
int itemContainerHeight = bankItemContainer.getHeight(); int itemContainerHeight = bankItemContainer.getHeight();
final int adjustedScrollHeight = (Math.max(0, items - 1) / ITEMS_PER_ROW) * ITEM_VERTICAL_SPACING + ITEM_VERTICAL_SPACING + ITEM_CONTAINER_BOTTOM_PADDING; final int adjustedScrollHeight = (Math.max(0, items - 1) / ITEMS_PER_ROW) * ITEM_VERTICAL_SPACING + ITEM_VERTICAL_SPACING + ITEM_CONTAINER_BOTTOM_PADDING;
itemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight)); bankItemContainer.setScrollHeight(Math.max(adjustedScrollHeight, itemContainerHeight));
final int itemContainerScroll = bankItemContainer.getScrollY(); final int itemContainerScroll = bankItemContainer.getScrollY();
clientThread.invokeLater(() -> clientThread.invokeLater(() ->
@@ -561,7 +575,6 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
WidgetInfo.BANK_SCROLLBAR.getId(), WidgetInfo.BANK_SCROLLBAR.getId(),
WidgetInfo.BANK_ITEM_CONTAINER.getId(), WidgetInfo.BANK_ITEM_CONTAINER.getId(),
itemContainerScroll)); itemContainerScroll));
} }
@Subscribe @Subscribe