fix(input): cancel eyedrop when changing toolbar index (#140)

Xenira · Mar 11, 2024 · 7f4f7c7 · 7f4f7c7
1 parent c7b3d39
commit 7f4f7c7
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/plugin/src/input/ui/ToolbarInteractableUi.cs b/plugin/src/input/ui/ToolbarInteractableUi.cs
@@ -35,6 +35,15 @@ private Interactable getInteractable(ToolbarSlotUI uiSlot)
 	private void onClick(ToolbarSlotUI uiSlot)
 	{
 		Logger.LogDebug($"Clicked toolbar slot {uiSlot.slotIndex} {uiSlot.primaryToolbar}");
+
+		Player.instance.builder.ExitEyeDropperMode();
+
+		if (isSelected(uiSlot) && !Player.instance.toolbar.IsToolbarHidden)
+		{
+			Player.instance.toolbar.TogglePutAway();
+			return;
+		}
+
 		selectSlot(uiSlot);
 	}
 
@@ -120,6 +129,11 @@ private int getToolbarIndex(ToolbarSlotUI slot)
 		return slot.primaryToolbar ? Player.instance.toolbar.selectedToolbar : Player.instance.toolbar.secondaryToolbar;
 	}
 
+	private bool isSelected(ToolbarSlotUI slot)
+	{
+		return Player.instance.toolbar._primaryToolbarSelected == slot.primaryToolbar && Player.instance.toolbar.selectedIndex == slot.slotIndex;
+	}
+
 	private ResourceInfo getSlotResource(ToolbarSlotUI slot)
 	{
 		return slot.setResource;