diff --git a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java index 2b2ac589c7..32e7d49ca7 100644 --- a/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java +++ b/runelite-api/src/main/java/net/runelite/api/widgets/Widget.java @@ -469,34 +469,6 @@ public interface Widget */ void setOriginalWidth(int originalWidth); - /** - * Gets the additional x-axis padding. - * - * @return the x-axis padding - */ - int getPaddingX(); - - /** - * Sets the x-axis padding. - * - * @param paddingX the new padding - */ - void setPaddingX(int paddingX); - - /** - * Gets the additional y-axis padding. - * - * @return the y-axis padding - */ - int getPaddingY(); - - /** - * Sets the y-axis padding. - * - * @param paddingY the new padding - */ - void setPaddingY(int paddingY); - /** * Gets the actions available on the widget. * @@ -566,14 +538,17 @@ public interface Widget void setFontId(int id); /** - * Returns the border thickness of the widget + * Returns the border type of item/sprite on the widget + * 0 - No border + * 1 - 1px black border + * 2 - 1px black under 1px white border (selected item) */ - int getBorderThickness(); + int getBorderType(); /** - * Sets the border thickness of the widget + * @see #getBorderType */ - void setBorderThickness(int thickness); + void setBorderType(int thickness); /** * Returns if text is shadowed 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 f1a87d014a..c3acc07f95 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 @@ -142,9 +142,7 @@ public class WidgetInfoTableModel extends AbstractTableModel out.add(new WidgetField<>("ScrollHeight", Widget::getScrollHeight, Widget::setScrollHeight, Integer.class)); out.add(new WidgetField<>("OriginalX", Widget::getOriginalX)); out.add(new WidgetField<>("OriginalY", Widget::getOriginalY)); - out.add(new WidgetField<>("PaddingX", Widget::getPaddingX)); - out.add(new WidgetField<>("PaddingY", Widget::getPaddingY)); - out.add(new WidgetField<>("BorderThickness", Widget::getBorderThickness, Widget::setBorderThickness, Integer.class)); + out.add(new WidgetField<>("BorderType", Widget::getBorderType, Widget::setBorderType, Integer.class)); out.add(new WidgetField<>("IsIf3", Widget::isIf3)); out.add(new WidgetField<>("HasListener", Widget::hasListener, Widget::setHasListener, Boolean.class)); diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java index 4e4c9008f0..cc22c7b71f 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -277,8 +277,8 @@ public abstract class RSWidgetMixin implements RSWidget } int columns = getWidth(); // the number of item slot columns is stored here - int paddingX = getPaddingX(); - int paddingY = getPaddingY(); + int xPitch = getXPitch(); + int yPitch = getYPitch(); int itemId = itemIds[index]; int itemQuantity = itemQuantities[index]; @@ -291,8 +291,8 @@ public abstract class RSWidgetMixin implements RSWidget int row = index / columns; int col = index % columns; - int itemX = widgetCanvasLocation.getX() + ((ITEM_SLOT_SIZE + paddingX) * col); - int itemY = widgetCanvasLocation.getY() + ((ITEM_SLOT_SIZE + paddingY) * row); + int itemX = widgetCanvasLocation.getX() + ((ITEM_SLOT_SIZE + xPitch) * col); + int itemY = widgetCanvasLocation.getY() + ((ITEM_SLOT_SIZE + yPitch) * row); Rectangle bounds = new Rectangle(itemX - 1, itemY - 1, ITEM_SLOT_SIZE, ITEM_SLOT_SIZE); return new WidgetItem(itemId - 1, itemQuantity, index, bounds); diff --git a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java index c21c54c423..86ac64ba3c 100644 --- a/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java +++ b/runescape-api/src/main/java/net/runelite/rs/api/RSWidget.java @@ -29,9 +29,6 @@ import net.runelite.mapping.Import; public interface RSWidget extends Widget { - @Import("dynamicValues") - int[][] getDynamicValues(); - @Import("children") @Override RSWidget[] getChildren(); @@ -87,10 +84,10 @@ public interface RSWidget extends Widget @Import("text") String getRSText(); - @Import("opBase") + @Import("name") String getRSName(); - @Import("opBase") + @Import("name") void setRSName(String name); @Import("text") @@ -218,13 +215,13 @@ public interface RSWidget extends Widget @Override void setSpriteId(int spriteId); - @Import("borderThickness") + @Import("borderType") @Override - int getBorderThickness(); + int getBorderType(); - @Import("borderThickness") + @Import("borderType") @Override - void setBorderThickness(int thickness); + void setBorderType(int type); @Import("itemId") @Override @@ -274,21 +271,11 @@ public interface RSWidget extends Widget @Override void setOriginalWidth(int originalWidth); - @Import("paddingX") - @Override - int getPaddingX(); + @Import("xPitch") + int getXPitch(); - @Import("paddingX") - @Override - void setPaddingX(int paddingX); - - @Import("paddingY") - @Override - int getPaddingY(); - - @Import("paddingY") - @Override - void setPaddingY(int paddingY); + @Import("yPitch") + int getYPitch(); void broadcastHidden(boolean hidden);