From 27ea3fbab689764a9cdf7483cd92cf768402b16d Mon Sep 17 00:00:00 2001 From: Max Weber Date: Sun, 27 Dec 2020 10:20:55 -0700 Subject: [PATCH] runelite-api: add WidgetNode::modalMode --- .../java/net/runelite/api/WidgetNode.java | 5 +++ .../runelite/api/widgets/WidgetModalMode.java | 32 +++++++++++++++++++ .../devtools/WidgetInfoTableModel.java | 18 +++++++++-- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java diff --git a/runelite-api/src/main/java/net/runelite/api/WidgetNode.java b/runelite-api/src/main/java/net/runelite/api/WidgetNode.java index dbdaf9936e..494a33c40f 100644 --- a/runelite-api/src/main/java/net/runelite/api/WidgetNode.java +++ b/runelite-api/src/main/java/net/runelite/api/WidgetNode.java @@ -36,4 +36,9 @@ public interface WidgetNode extends Node * @see net.runelite.api.widgets.Widget */ int getId(); + + /** + * @see net.runelite.api.widgets.WidgetModalMode + */ + int getModalMode(); } diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java new file mode 100644 index 0000000000..9c875fa3fd --- /dev/null +++ b/runelite-api/src/main/java/net/runelite/api/widgets/WidgetModalMode.java @@ -0,0 +1,32 @@ +/* + * Copyright (c) 2020 Abex + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +package net.runelite.api.widgets; + +public class WidgetModalMode +{ + public static final int MODAL_NOCLICKTHROUGH = 0; + public static final int NON_MODAL = 1; + public static final int MODAL_CLICKTHROUGH = 3; +} 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 2b515e5fb4..c996287728 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 @@ -32,6 +32,8 @@ import java.util.Map; import java.util.function.Function; import javax.swing.SwingUtilities; import javax.swing.table.AbstractTableModel; +import net.runelite.api.Client; +import net.runelite.api.WidgetNode; import net.runelite.api.widgets.Widget; import net.runelite.client.callback.ClientThread; @@ -40,10 +42,13 @@ public class WidgetInfoTableModel extends AbstractTableModel @Inject private ClientThread clientThread; + @Inject + private Client client; + private static final int COL_FIELD = 0; private static final int COL_VALUE = 1; - private static final List fields = populateWidgetFields(); + private final List fields = populateWidgetFields(); private Widget widget = null; private Map values = null; @@ -132,7 +137,7 @@ public class WidgetInfoTableModel extends AbstractTableModel }); } - private static List populateWidgetFields() + private List populateWidgetFields() { List out = new ArrayList<>(); @@ -194,6 +199,15 @@ public class WidgetInfoTableModel extends AbstractTableModel 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)); + out.add(new WidgetField<>("ModalMode", w -> + { + WidgetNode attachment = client.getComponentTable().get(w.getParentId()); + if (attachment != null) + { + return attachment.getModalMode(); + } + return null; + })); return out; }