Merge pull request #9945 from dekvall/grid-item-swap
Inventorygrid: Draw image for replaced item
This commit is contained in:
@@ -82,6 +82,7 @@ class InventoryGridOverlay extends Overlay
|
|||||||
final int if1DraggedItemIndex = client.getIf1DraggedItemIndex();
|
final int if1DraggedItemIndex = client.getIf1DraggedItemIndex();
|
||||||
final WidgetItem draggedItem = inventoryWidget.getWidgetItem(if1DraggedItemIndex);
|
final WidgetItem draggedItem = inventoryWidget.getWidgetItem(if1DraggedItemIndex);
|
||||||
final int itemId = draggedItem.getId();
|
final int itemId = draggedItem.getId();
|
||||||
|
final Rectangle initialBounds = draggedItem.getCanvasBounds();
|
||||||
|
|
||||||
if (itemId == -1)
|
if (itemId == -1)
|
||||||
{
|
{
|
||||||
@@ -91,19 +92,15 @@ class InventoryGridOverlay extends Overlay
|
|||||||
for (int i = 0; i < INVENTORY_SIZE; ++i)
|
for (int i = 0; i < INVENTORY_SIZE; ++i)
|
||||||
{
|
{
|
||||||
WidgetItem widgetItem = inventoryWidget.getWidgetItem(i);
|
WidgetItem widgetItem = inventoryWidget.getWidgetItem(i);
|
||||||
|
final int targetItemId = widgetItem.getId();
|
||||||
|
|
||||||
final Rectangle bounds = widgetItem.getCanvasBounds();
|
final Rectangle bounds = widgetItem.getCanvasBounds();
|
||||||
boolean inBounds = bounds.contains(mousePoint);
|
boolean inBounds = bounds.contains(mousePoint);
|
||||||
|
|
||||||
if (config.showItem() && inBounds)
|
if (config.showItem() && inBounds)
|
||||||
{
|
{
|
||||||
final BufferedImage draggedItemImage = itemManager.getImage(itemId);
|
drawItem(graphics, bounds, itemId);
|
||||||
final int x = (int) bounds.getX();
|
drawItem(graphics, initialBounds, targetItemId);
|
||||||
final int y = (int) bounds.getY();
|
|
||||||
|
|
||||||
graphics.setComposite(AlphaComposite.SrcOver.derive(0.3f));
|
|
||||||
graphics.drawImage(draggedItemImage, x, y, null);
|
|
||||||
graphics.setComposite(AlphaComposite.SrcOver);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (config.showHighlight() && inBounds)
|
if (config.showHighlight() && inBounds)
|
||||||
@@ -120,4 +117,20 @@ class InventoryGridOverlay extends Overlay
|
|||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void drawItem(Graphics2D graphics, Rectangle bounds, int itemId)
|
||||||
|
{
|
||||||
|
if (itemId == -1)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
final BufferedImage draggedItemImage = itemManager.getImage(itemId);
|
||||||
|
final int x = (int) bounds.getX();
|
||||||
|
final int y = (int) bounds.getY();
|
||||||
|
|
||||||
|
graphics.setComposite(AlphaComposite.SrcOver.derive(0.3f));
|
||||||
|
graphics.drawImage(draggedItemImage, x, y, null);
|
||||||
|
graphics.setComposite(AlphaComposite.SrcOver);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user