From 408d567fcf45cbbc12c96be2c56c1dae7ca7c3e1 Mon Sep 17 00:00:00 2001 From: Hydrox6 Date: Tue, 19 Nov 2019 21:33:30 +0000 Subject: [PATCH] inventory grid: use correct item quantities for drag previews --- .../inventorygrid/InventoryGridOverlay.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java index a179c3f5f2..9eaced470d 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/inventorygrid/InventoryGridOverlay.java @@ -85,7 +85,6 @@ class InventoryGridOverlay extends Overlay final Point mousePoint = new Point(mouse.getX(), mouse.getY()); final int if1DraggedItemIndex = client.getIf1DraggedItemIndex(); final WidgetItem draggedItem = inventoryWidget.getWidgetItem(if1DraggedItemIndex); - final int itemId = draggedItem.getId(); final Rectangle initialBounds = draggedItem.getCanvasBounds(); if (initialMousePoint == null) @@ -93,7 +92,7 @@ class InventoryGridOverlay extends Overlay initialMousePoint = mousePoint; } - if (itemId == -1 || !hoverActive && initialMousePoint.distance(mousePoint) < DISTANCE_TO_ACTIVATE_HOVER) + if (draggedItem.getId() == -1 || !hoverActive && initialMousePoint.distance(mousePoint) < DISTANCE_TO_ACTIVATE_HOVER) { return null; } @@ -102,16 +101,15 @@ class InventoryGridOverlay extends Overlay for (int i = 0; i < INVENTORY_SIZE; ++i) { - WidgetItem widgetItem = inventoryWidget.getWidgetItem(i); - final int targetItemId = widgetItem.getId(); + WidgetItem targetWidgetItem = inventoryWidget.getWidgetItem(i); - final Rectangle bounds = widgetItem.getCanvasBounds(); + final Rectangle bounds = targetWidgetItem.getCanvasBounds(); boolean inBounds = bounds.contains(mousePoint); if (config.showItem() && inBounds) { - drawItem(graphics, bounds, itemId); - drawItem(graphics, initialBounds, targetItemId); + drawItem(graphics, bounds, draggedItem); + drawItem(graphics, initialBounds, targetWidgetItem); } if (config.showHighlight() && inBounds) @@ -129,14 +127,14 @@ class InventoryGridOverlay extends Overlay return null; } - private void drawItem(Graphics2D graphics, Rectangle bounds, int itemId) + private void drawItem(Graphics2D graphics, Rectangle bounds, WidgetItem item) { - if (itemId == -1) + if (item.getId() == -1) { return; } - final BufferedImage draggedItemImage = itemManager.getImage(itemId); + final BufferedImage draggedItemImage = itemManager.getImage(item.getId(), item.getQuantity(), false); final int x = (int) bounds.getX(); final int y = (int) bounds.getY();