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

devtools: add dragParent to widget inspector

Browse Source
This commit is contained in:
Max Weber
2020-12-03 00:44:46 -07:00
parent 54f953dc42
commit 7840bb2b18
4 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java
View File

@@ -64,6 +64,10 @@ public class WidgetField<T>
{ {
return value; return value;
} }
if (value instanceof Widget)
{
return WidgetInspector.getWidgetIdentifier((Widget) value);
}
return MessageFormatter.format("{}", value).getMessage(); return MessageFormatter.format("{}", value).getMessage();
} }

1
runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java
View File

@@ -193,6 +193,7 @@ public class WidgetInfoTableModel extends AbstractTableModel
out.add(new WidgetField<>("NoClickThrough", Widget::getNoClickThrough, Widget::setNoClickThrough, Boolean.class)); out.add(new WidgetField<>("NoClickThrough", Widget::getNoClickThrough, Widget::setNoClickThrough, Boolean.class));
out.add(new WidgetField<>("NoScrollThrough", Widget::getNoScrollThrough, Widget::setNoScrollThrough, Boolean.class)); out.add(new WidgetField<>("NoScrollThrough", Widget::getNoScrollThrough, Widget::setNoScrollThrough, Boolean.class));
out.add(new WidgetField<>("TargetVerb", Widget::getTargetVerb, Widget::setTargetVerb, String.class)); out.add(new WidgetField<>("TargetVerb", Widget::getTargetVerb, Widget::setTargetVerb, String.class));
out.add(new WidgetField<>("DragParent", Widget::getDragParent));
return out; return out;
} }

21
runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java
View File

@@ -59,6 +59,8 @@ import net.runelite.api.Client;
import net.runelite.api.MenuAction; import net.runelite.api.MenuAction;
import net.runelite.api.MenuEntry; import net.runelite.api.MenuEntry;
import net.runelite.api.SpriteID; import net.runelite.api.SpriteID;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
import net.runelite.client.events.ConfigChanged; import net.runelite.client.events.ConfigChanged;
import net.runelite.api.events.MenuEntryAdded; import net.runelite.api.events.MenuEntryAdded;
import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.MenuOptionClicked;
@@ -578,4 +580,23 @@ class WidgetInspector extends JFrame
return null; return null;
} }
public static String getWidgetIdentifier(Widget widget)
{
int id = widget.getId();
String str = TO_GROUP(id) + "." + TO_CHILD(id);
if (widget.getIndex() != -1)
{
str += "[" + widget.getIndex() + "]";
}
WidgetInfo info = WidgetInspector.getWidgetInfo(id);
if (info != null)
{
str += " " + info.name();
}
return str;
}
} }

21
runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetTreeNode.java
View File

@@ -26,9 +26,6 @@ package net.runelite.client.plugins.devtools;
import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultMutableTreeNode;
import net.runelite.api.widgets.Widget; import net.runelite.api.widgets.Widget;
import net.runelite.api.widgets.WidgetInfo;
import static net.runelite.api.widgets.WidgetInfo.TO_CHILD;
import static net.runelite.api.widgets.WidgetInfo.TO_GROUP;
class WidgetTreeNode extends DefaultMutableTreeNode class WidgetTreeNode extends DefaultMutableTreeNode
{ {
@@ -48,22 +45,6 @@ class WidgetTreeNode extends DefaultMutableTreeNode
@Override @Override
public String toString() public String toString()
{ {
Widget widget = getWidget(); return type + " " + WidgetInspector.getWidgetIdentifier(getWidget());
int id = widget.getId();
String str = type + " " + TO_GROUP(id) + "." + TO_CHILD(id);
if (widget.getIndex() != -1)
{
str += "[" + widget.getIndex() + "]";
}
WidgetInfo info = WidgetInspector.getWidgetInfo(id);
if (info != null)
{
str += " " + info.name();
}
return str;
} }
} }