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

Merge pull request #5906 from raiyni/tag-bugs

Browse Source 
Fix tags resetting when bank window is closed and active tab matching for long tags
This commit is contained in:
Tomas Slusny
2018-10-10 22:11:57 +02:00
committed by GitHub
parent d3247f6ffd 593cd23394
commit 8d7e569b19
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import com.google.common.eventbus.Subscribe;
import com.google.inject.Provides; import com.google.inject.Provides;
import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelEvent;
import java.util.Arrays; import java.util.Arrays;
import java.util.Objects;
import javax.inject.Inject; import javax.inject.Inject;
import net.runelite.api.Client; import net.runelite.api.Client;
import net.runelite.api.InventoryID; import net.runelite.api.InventoryID;
@@ -40,6 +41,7 @@ import net.runelite.api.ItemComposition;
import net.runelite.api.ItemContainer; import net.runelite.api.ItemContainer;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.VarClientStr;
import net.runelite.api.events.ConfigChanged; import net.runelite.api.events.ConfigChanged;
import net.runelite.api.events.DraggingWidgetChanged; import net.runelite.api.events.DraggingWidgetChanged;
import net.runelite.api.events.GameTick; import net.runelite.api.events.GameTick;
@@ -248,7 +250,7 @@ public class BankTagsPlugin extends Plugin implements MouseWheelListener
chatboxInputManager.openInputWindow(itemName + " tags:", initialValue, (newTags) -> chatboxInputManager.openInputWindow(itemName + " tags:", initialValue, (newTags) ->
{ {
if (newTags == null) if (!Objects.equals(newTags, client.getVar(VarClientStr.INPUT_TEXT)))
{ {
return; return;
} }

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

@@ -224,6 +224,14 @@ public class TabInterface
return; return;
} }
if (activeTab != null && client.getVar(VarClientInt.INPUT_TYPE) == InputType.RUNELITE.getType())
{
// don't reset active tab if we are editing tags
updateBounds();
scrollTab(0);
return;
}
String str = client.getVar(VarClientStr.INPUT_TEXT); String str = client.getVar(VarClientStr.INPUT_TEXT);
if (Strings.isNullOrEmpty(str)) if (Strings.isNullOrEmpty(str))
@@ -232,7 +240,7 @@ public class TabInterface
} }
Widget bankTitle = client.getWidget(WidgetInfo.BANK_TITLE_BAR); Widget bankTitle = client.getWidget(WidgetInfo.BANK_TITLE_BAR);
if (bankTitle != null && !bankTitle.isHidden()) if (bankTitle != null && !bankTitle.isHidden() && !str.startsWith(TAG_SEARCH))
{ {
str = bankTitle.getText().replaceFirst("Showing items: ", ""); str = bankTitle.getText().replaceFirst("Showing items: ", "");