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

Merge pull request #10568 from abextm/banktags-new-at-end

Browse Source 
banktags: move new tagtab button to the bottom of the list
This commit is contained in:
Abex
2020-01-09 04:41:05 -07:00
committed by GitHub
parent 732db3940f 358703f307
commit 818018e858
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
runelite-client/src/main/java/net/runelite/client/plugins/banktags/tabs/TabInterface.java
View File

@@ -859,19 +859,21 @@ public class TabInterface
--maxTabs; --maxTabs;
} }
if (currentTabIndex + direction >= tabManager.size() || currentTabIndex + direction < 0) int proposedIndex = currentTabIndex + direction;
int numTabs = tabManager.size() + 1;
if (proposedIndex >= numTabs || proposedIndex < 0)
{ {
currentTabIndex = 0; currentTabIndex = 0;
} }
else if (numTabs - proposedIndex >= maxTabs)
if ((tabManager.size() - (currentTabIndex + direction) >= maxTabs) && (currentTabIndex + direction > -1))
{ {
currentTabIndex += direction; currentTabIndex = proposedIndex;
} }
else if (maxTabs < tabManager.size() && tabManager.size() - (currentTabIndex + direction) < maxTabs) else if (maxTabs < numTabs && numTabs - proposedIndex < maxTabs)
{ {
// Edge case when only 1 tab displays instead of up to maxTabs when one is deleted at the end of the list // Edge case when only 1 tab displays instead of up to maxTabs when one is deleted at the end of the list
currentTabIndex += direction; currentTabIndex = proposedIndex;
scrollTab(-1); scrollTab(-1);
} }
@@ -952,7 +954,7 @@ public class TabInterface
{ {
int y = bounds.y + MARGIN + BUTTON_HEIGHT; int y = bounds.y + MARGIN + BUTTON_HEIGHT;
if (maxTabs >= tabManager.size()) if (maxTabs > tabManager.size())
{ {
currentTabIndex = 0; currentTabIndex = 0;
} }
@@ -978,6 +980,8 @@ public class TabInterface
y += TAB_HEIGHT + MARGIN; y += TAB_HEIGHT + MARGIN;
} }
updateWidget(newTab, y);
boolean hidden = !(tabManager.size() > 0); boolean hidden = !(tabManager.size() > 0);
upButton.setHidden(hidden); upButton.setHidden(hidden);