From beffea2b1868eaa0535e37963e7fa573ff89bd1c Mon Sep 17 00:00:00 2001 From: Sundar-Gandu <86447677+Sundar-Gandu@users.noreply.github.com> Date: Thu, 30 Dec 2021 00:17:34 -0500 Subject: [PATCH 1/2] mixin: Add setter for widget padding --- .../src/main/java/net/runelite/api/widgets/Widget.java | 10 ++++++++++ .../src/main/java/net/runelite/rs/api/RSWidget.java | 9 +++++++++ 2 files changed, 19 insertions(+) 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 19bb851535..469d09473f 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 @@ -1085,4 +1085,14 @@ public interface Widget * Gets the image which is (or should be) drawn on this widget */ SpritePixels getSprite(); + + /** + * Sets the X padding between widgets, mainly for inventory items + */ + void setPaddingX(int val); + + /** + * Sets the Y padding between widgets, mainly for inventory items + */ + void setPaddingY(int val); } 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 8d4e81ad02..78fe76f860 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 @@ -345,6 +345,15 @@ public interface RSWidget extends Widget @Import("paddingY") int getYPitch(); + @Import("paddingX") + @Override + void setPaddingX(int paddingX); + + @Import("paddingY") + @Override + void setPaddingY(int paddingY); + + @Import("onOp") @Override void setOnOpListener(Object... args); From 66ed22607d111b19786368a84e6fd617e5af76c3 Mon Sep 17 00:00:00 2001 From: Sundar-Gandu <86447677+Sundar-Gandu@users.noreply.github.com> Date: Thu, 30 Dec 2021 00:27:01 -0500 Subject: [PATCH 2/2] mixin: change widget getPitch to getPadding --- .../src/main/java/net/runelite/mixins/RSWidgetMixin.java | 8 ++++---- .../src/main/java/net/runelite/rs/api/RSWidget.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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 d98f1ba0a0..3bc6464018 100644 --- a/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java +++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java @@ -323,8 +323,8 @@ public abstract class RSWidgetMixin implements RSWidget } int columns = getWidth(); // the number of item slot columns is stored here - int xPitch = getXPitch(); - int yPitch = getYPitch(); + int xPadding = getPaddingX(); + int yPadding = getPaddingY(); int itemId = itemIds[index]; int itemQuantity = itemQuantities[index]; @@ -335,8 +335,8 @@ public abstract class RSWidgetMixin implements RSWidget int row = index / columns; int col = index % columns; - int itemX = rl$x + ((ITEM_SLOT_SIZE + xPitch) * col); - int itemY = rl$y + ((ITEM_SLOT_SIZE + yPitch) * row); + int itemX = rl$x + ((ITEM_SLOT_SIZE + xPadding) * col); + int itemY = rl$y + ((ITEM_SLOT_SIZE + yPadding) * row); boolean isDragged = isWidgetItemDragged(index); int dragOffsetX = 0; 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 78fe76f860..5fcb2efc9a 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 @@ -340,10 +340,10 @@ public interface RSWidget extends Widget void setOriginalWidth(int originalWidth); @Import("paddingX") - int getXPitch(); + int getPaddingX(); @Import("paddingY") - int getYPitch(); + int getPaddingY(); @Import("paddingX") @Override