set slot tooltip delay to 0 & refactor

src/graphics/ui/elements/InventoryView.cpp

@@ -112,7 +112,7 @@ SlotView::SlotView(
     layout(std::move(layout))
 {
     setColor(glm::vec4(0, 0, 0, 0.2f));
-    setTooltipDelay(0.05f);
+    setTooltipDelay(0.0f);
 }
 
 void SlotView::draw(const DrawContext* pctx, Assets* assets) {
@@ -208,18 +208,7 @@ bool SlotView::isHighlighted() const {
     return highlighted;
 }
 
-void SlotView::clicked(gui::GUI* gui, mousecode button) {
+void SlotView::performLeftClick(ItemStack& stack, ItemStack& grabbed) {
-    if (bound == nullptr)
-        return;
-
-    auto exchangeSlot = std::dynamic_pointer_cast<SlotView>(gui->get(EXCHANGE_SLOT_NAME));
-    if (exchangeSlot == nullptr) {
-        return;
-    }
-    ItemStack& grabbed = exchangeSlot->getStack();
-    ItemStack& stack = *bound;
-    
-    if (button == mousecode::BUTTON_1) {
     if (Events::pressed(keycode::LEFT_SHIFT)) {
         if (layout.shareFunc) {
             layout.shareFunc(layout.index, stack);
@@ -242,7 +231,9 @@ void SlotView::clicked(gui::GUI* gui, mousecode button) {
             std::swap(grabbed, stack);
         }
     }
-    } else if (button == mousecode::BUTTON_2) {
+}
+
+void SlotView::performRightClick(ItemStack& stack, ItemStack& grabbed) {
     if (layout.rightClick) {
         layout.rightClick(inventoryid, stack);
         if (layout.updateFunc) {
@@ -259,9 +250,9 @@ void SlotView::clicked(gui::GUI* gui, mousecode button) {
             grabbed.setCount(stack.getCount() - halfremain);
             stack.setCount(halfremain);
         }
-        } else {
+        return;
-            auto& stackDef =
+    }
-                content->getIndices()->items.require(stack.getItemId());
+    auto& stackDef = content->getIndices()->items.require(stack.getItemId());
     if (stack.isEmpty()) {
         stack.set(grabbed);
         stack.setCount(1);
@@ -271,6 +262,22 @@ void SlotView::clicked(gui::GUI* gui, mousecode button) {
         grabbed.setCount(grabbed.getCount() - 1);
     }
 }
+
+void SlotView::clicked(gui::GUI* gui, mousecode button) {
+    if (bound == nullptr)
+        return;
+    auto exchangeSlot =
+        std::dynamic_pointer_cast<SlotView>(gui->get(EXCHANGE_SLOT_NAME));
+    if (exchangeSlot == nullptr) {
+        return;
+    }
+    ItemStack& grabbed = exchangeSlot->getStack();
+    ItemStack& stack = *bound;
+    
+    if (button == mousecode::BUTTON_1) {
+        performLeftClick(stack, grabbed);
+    } else if (button == mousecode::BUTTON_2) {
+        performRightClick(stack, grabbed);
     }
     if (layout.updateFunc) {
         layout.updateFunc(layout.index, stack);

src/graphics/ui/elements/InventoryView.hpp

@@ -55,6 +55,9 @@ namespace gui {
 
         std::wstring tooltip;
         itemid_t prevItem = 0;
+
+        void performLeftClick(ItemStack& stack, ItemStack& grabbed);
+        void performRightClick(ItemStack& stack, ItemStack& grabbed);
     public:
         SlotView(SlotLayout layout);