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

mixins: optimize widget isHidden and getParent

Browse Source
This commit is contained in:
Adam
2018-07-21 22:54:14 -04:00
parent 630a3947da
commit 0297f7684c
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
View File

@@ -119,6 +119,13 @@ public abstract class RSWidgetMixin implements RSWidget
return rsParentId; return rsParentId;
} }
final int id = getId();
if (TO_GROUP(id) == client.getWidgetRoot())
{
// this is a root widget
return -1;
}
int parentId = rl$parentId; int parentId = rl$parentId;
if (parentId != -1) if (parentId != -1)
{ {
@@ -130,7 +137,7 @@ public abstract class RSWidgetMixin implements RSWidget
// check the parent in the component table // check the parent in the component table
HashTable<WidgetNode> componentTable = client.getComponentTable(); HashTable<WidgetNode> componentTable = client.getComponentTable();
WidgetNode widgetNode = componentTable.get(parentId); WidgetNode widgetNode = componentTable.get(parentId);
if (widgetNode == null || widgetNode.getId() != TO_GROUP(getId())) if (widgetNode == null || widgetNode.getId() != TO_GROUP(id))
{ {
// invalidate parent // invalidate parent
rl$parentId = -1; rl$parentId = -1;
@@ -191,6 +198,11 @@ public abstract class RSWidgetMixin implements RSWidget
@Override @Override
public boolean isHidden() public boolean isHidden()
{ {
if (isSelfHidden())
{
return true;
}
Widget parent = getParent(); Widget parent = getParent();
if (parent == null) if (parent == null)
@@ -208,7 +220,7 @@ public abstract class RSWidgetMixin implements RSWidget
return true; return true;
} }
return isSelfHidden(); return false;
} }
@Inject @Inject