inv grid: fix for if3 inv
This commit is contained in:
@@ -78,16 +78,13 @@ class InventoryGridOverlay extends Overlay
|
|||||||
}
|
}
|
||||||
|
|
||||||
// grid is only supported on bank inventory and inventory
|
// grid is only supported on bank inventory and inventory
|
||||||
Widget inventoryWidget = draggingWidget.isIf3() ?
|
if (draggingWidget.getId() != WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER.getId()
|
||||||
client.getWidget(WidgetInfo.BANK_INVENTORY_ITEMS_CONTAINER) :
|
&& draggingWidget.getId() != WidgetInfo.INVENTORY.getId())
|
||||||
client.getWidget(WidgetInfo.INVENTORY);
|
|
||||||
|
|
||||||
// with if3 the dragged widget is a child of the inventory, with if1 it is an item of the inventory (and the same widget)
|
|
||||||
if (inventoryWidget == null || (draggingWidget.isIf3() ? draggingWidget.getParent() != inventoryWidget : draggingWidget != inventoryWidget))
|
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
final Widget inventoryWidget = draggingWidget.getParent();
|
||||||
final net.runelite.api.Point mouse = client.getMouseCanvasPosition();
|
final net.runelite.api.Point mouse = client.getMouseCanvasPosition();
|
||||||
final Point mousePoint = new Point(mouse.getX(), mouse.getY());
|
final Point mousePoint = new Point(mouse.getX(), mouse.getY());
|
||||||
final int draggedItemIndex = draggingWidget.isIf3() ? draggingWidget.getIndex() : client.getIf1DraggedItemIndex();
|
final int draggedItemIndex = draggingWidget.isIf3() ? draggingWidget.getIndex() : client.getIf1DraggedItemIndex();
|
||||||
@@ -100,7 +97,7 @@ class InventoryGridOverlay extends Overlay
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (draggedItem.getId() == -1
|
if (draggedItem.getId() == -1
|
||||||
|| client.getItemPressedDuration() < config.dragDelay() / Constants.CLIENT_TICK_LENGTH
|
|| (draggingWidget.isIf3() ? client.getDragTime() : client.getItemPressedDuration()) < config.dragDelay() / Constants.CLIENT_TICK_LENGTH
|
||||||
|| !hoverActive && initialMousePoint.distance(mousePoint) < DISTANCE_TO_ACTIVATE_HOVER)
|
|| !hoverActive && initialMousePoint.distance(mousePoint) < DISTANCE_TO_ACTIVATE_HOVER)
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
|
|||||||
Reference in New Issue
Block a user