From 7840bb2b184b1fb08e8e03a4319a42b0e45ec0ae Mon Sep 17 00:00:00 2001 From: Max Weber Date: Thu, 3 Dec 2020 00:44:46 -0700 Subject: [PATCH] devtools: add dragParent to widget inspector --- .../client/plugins/devtools/WidgetField.java | 4 ++++ .../devtools/WidgetInfoTableModel.java | 1 + .../plugins/devtools/WidgetInspector.java | 21 +++++++++++++++++++ .../plugins/devtools/WidgetTreeNode.java | 21 +------------------ 4 files changed, 27 insertions(+), 20 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java index a4b21cb94d..cc92dd9fd5 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetField.java @@ -64,6 +64,10 @@ public class WidgetField { return value; } + if (value instanceof Widget) + { + return WidgetInspector.getWidgetIdentifier((Widget) value); + } return MessageFormatter.format("{}", value).getMessage(); } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java index a08323eba3..2b515e5fb4 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInfoTableModel.java @@ -193,6 +193,7 @@ public class WidgetInfoTableModel extends AbstractTableModel 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<>("TargetVerb", Widget::getTargetVerb, Widget::setTargetVerb, String.class)); + out.add(new WidgetField<>("DragParent", Widget::getDragParent)); return out; } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java index 7407711d58..2e99bc3a97 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetInspector.java @@ -59,6 +59,8 @@ import net.runelite.api.Client; import net.runelite.api.MenuAction; import net.runelite.api.MenuEntry; 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.api.events.MenuEntryAdded; import net.runelite.api.events.MenuOptionClicked; @@ -578,4 +580,23 @@ class WidgetInspector extends JFrame 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; + } } diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetTreeNode.java b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetTreeNode.java index 6b7526637a..c82a4d775e 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetTreeNode.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/devtools/WidgetTreeNode.java @@ -26,9 +26,6 @@ package net.runelite.client.plugins.devtools; import javax.swing.tree.DefaultMutableTreeNode; 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 { @@ -48,22 +45,6 @@ class WidgetTreeNode extends DefaultMutableTreeNode @Override public String toString() { - Widget widget = 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; + return type + " " + WidgetInspector.getWidgetIdentifier(getWidget()); } }