Add a parameter for mousewheel scrolling and helper functions for slider

SlimeKnights · Nov 18, 2015 · 94bf46a · 94bf46a
1 parent 97931ac
commit 94bf46a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 8 deletions.
diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiModule.java b/src/main/java/slimeknights/mantle/client/gui/GuiModule.java
@@ -7,6 +7,7 @@
 import net.minecraftforge.fml.relauncher.SideOnly;
 
 import java.io.IOException;
+import java.util.List;
 
 // a sub-gui. Mostly the same as a separate GuiContainer, but doesn't do the calls that affect the game as if this were the only gui
 @SideOnly(Side.CLIENT)
@@ -67,6 +68,20 @@ public boolean shouldDrawSlot(Slot slot) {
     return true;
   }
 
+  public boolean isMouseInModule(int mouseX, int mouseY) {
+    return mouseX >= this.guiLeft && mouseX < this.guiRight() &&
+           mouseY >= this.guiTop && mouseY < this.guiBottom();
+  }
+
+  public boolean isMouseOverFullSlot(int mouseX, int mouseY) {
+    for(Slot slot : (List<Slot>)inventorySlots.inventorySlots) {
+      if(parent.isMouseOverSlot(slot, mouseX, mouseY) && slot.getHasStack()) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /*
     public void updateDragged(boolean dragSplitting, Set draggedSlots) {
       this.dragSplitting = dragSplitting;

diff --git a/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java b/src/main/java/slimeknights/mantle/client/gui/GuiWidgetSlider.java
@@ -129,21 +129,23 @@ else if(isHighlighted) {
     }
   }
 
-  public void update(int mouseX, int mouseY) {
+  public void update(int mouseX, int mouseY, boolean useMouseWheel) {
     if(!enabled || hidden) {
       return;
     }
 
     boolean mouseDown = Mouse.isButtonDown(0); // left mouse button
     int wheel = Mouse.getDWheel();
 
-    if(wheel > 0) {
-      decrement();
-      return;
-    }
-    else if(wheel < 0) {
-      increment();
-      return;
+    if(useMouseWheel) {
+      if(wheel > 0) {
+        decrement();
+        return;
+      }
+      else if(wheel < 0) {
+        increment();
+        return;
+      }
     }
 
     // relative position inside the widget