Almost working sliders

2 files changed, 59 insertions, 18 deletions

diff --git a/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java b/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
index c08d1bc..5aae891 100644
--- a/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
+++ b/src/main/java/io/github/cottonmc/cotton/gui/widget/WSlider.java
@@ -1,12 +1,27 @@
 package io.github.cottonmc.cotton.gui.widget;
 
 import io.github.cottonmc.cotton.gui.client.ScreenDrawing;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
+import org.lwjgl.glfw.GLFW;
 
 import javax.annotation.Nullable;
 import java.util.function.IntConsumer;
 
+/**
+ * A slider widget that can be used to select int values.
+ *
+ * <p>You can set two listeners on a slider:
+ * <ul>
+ *     <li>A value change listener that gets all value changes (except direct setValue calls)</li>
+ *     <li>
+ *         A mouse release listener that gets called when the player stops dragging the slider.
+ *         For example, this can be used for sending sync packets to the server
+ *         when the player has selected a value.
+ *     </li>
+ * </ul>
+ */
 public class WSlider extends WWidget {
 	private static final int TRACK_WIDTH = 6;
 	private static final int THUMB_SIZE = 8;
@@ -22,12 +37,12 @@ public class WSlider extends WWidget {
 	@Nullable private IntConsumer valueChangeListener = null;
 	@Nullable private Runnable mouseReleaseListener = null;
 
-	// Used for detecting dragging after the user starts dragging
+	// Used for visuals and detecting dragging after the user starts dragging
 	// on top of the slider, but then moves the mouse out but still within the widget's boundary.
 	private boolean dragging = false;
 
 	public WSlider(int min, int max, Axis axis) {
-		if (max >= min)
+		if (max <= min)
 			throw new IllegalArgumentException("Minimum value must be smaller than the maximum!");
 
 		this.min = min;
@@ -56,15 +71,14 @@ public class WSlider extends WWidget {
 
 	@Override
 	public void onMouseDrag(int x, int y, int button) {
-		// a = mouse coordinate on slider axis, axisWidth = width of slider axis
+		// a = mouse coordinate on slider axis
 		// ao = axis-opposite mouse coordinate, aoCenter = center of ao's axis
 		int a = axis == Axis.HORIZONTAL ? x : y;
-		int axisWidth = axis == Axis.HORIZONTAL ? width : height;
 		int ao = axis == Axis.HORIZONTAL ? y : x;
 		int aoCenter = (axis == Axis.HORIZONTAL ? height : width) / 2;
-		if (dragging || ao >= aoCenter - TRACK_WIDTH / 2 && ao <= aoCenter + TRACK_WIDTH / 2) {
+		if (dragging || ao >= aoCenter - TRACK_WIDTH / 2 - 2 && ao <= aoCenter + TRACK_WIDTH / 2 + 2) {
 			dragging = true;
-			int pos = (axis == Axis.VERTICAL ? (axisWidth - a) : a) - THUMB_SIZE / 2;
+			int pos = (axis == Axis.VERTICAL ? (height - a) : a) - THUMB_SIZE / 2;
 			int futureValue = min + (int) (valueToCoordRatio * pos);
 			value = MathHelper.clamp(futureValue, min, max);
 			if (valueChangeListener != null) valueChangeListener.accept(value);
@@ -87,26 +101,53 @@ public class WSlider extends WWidget {
 
 	@Override
 	public void paintBackground(int x, int y) {
-		float px = 1 / 16f;
+		float px = 1 / 32f;
+
 		if (axis == Axis.VERTICAL) {
 			int trackX = x + width / 2 - TRACK_WIDTH / 2;
-			int thumbY = y + height - THUMB_SIZE + 1 - (int) (coordToValueRatio * (value - min));
-
-			ScreenDrawing.rect(TEXTURE, trackX, y + 1,      TRACK_WIDTH, 1,          0*px, 8*px,  6*px, 9*px,  0xFFFFFFFF);
-			ScreenDrawing.rect(TEXTURE, trackX, y + 2,      TRACK_WIDTH, height - 2, 0*px, 9*px,  6*px, 10*px, 0xFFFFFFFF);
-			ScreenDrawing.rect(TEXTURE, trackX, y + height, TRACK_WIDTH, 1,          0*px, 10*px, 6*px, 11*px, 0xFFFFFFFF);
 
-			ScreenDrawing.rect(TEXTURE, x + width / 2 - THUMB_SIZE / 2, thumbY, THUMB_SIZE, THUMB_SIZE, 0*px, 0*px, 8*px, 8*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, trackX, y + 1,      TRACK_WIDTH, 1,          16*px, 0*px, 22*px, 1*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, trackX, y + 2,      TRACK_WIDTH, height - 2, 16*px, 1*px, 22*px, 2*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, trackX, y + height, TRACK_WIDTH, 1,          16*px, 2*px, 22*px, 3*px, 0xFFFFFFFF);
 		} else {
 			int trackY = y + height / 2 - TRACK_WIDTH / 2;
-			int thumbX = x + (int) (coordToValueRatio * (value - min));
 
-			ScreenDrawing.rect(TEXTURE, x, trackY, 1, TRACK_WIDTH, 8*px, 0*px, 9*px, 6*px, 0xFFFFFFFF);
-			ScreenDrawing.rect(TEXTURE, x + 1, trackY, width - 2, TRACK_WIDTH, 9*px, 0*px, 10*px, 6*px, 0xFFFFFFFF);
-			ScreenDrawing.rect(TEXTURE, x + width - 1, trackY, 1, TRACK_WIDTH, 10*px, 0*px, 11*px, 6*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, x, trackY, 1, TRACK_WIDTH, 16*px, 3*px, 17*px, 9*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, x + 1, trackY, width - 2, TRACK_WIDTH, 17*px, 3*px, 18*px, 9*px, 0xFFFFFFFF);
+			ScreenDrawing.rect(TEXTURE, x + width - 1, trackY, 1, TRACK_WIDTH, 18*px, 3*px, 19*px, 9*px, 0xFFFFFFFF);
+		}
+	}
+
+	@Override
+	public void paintForeground(int x, int y, int mouseX, int mouseY) {
+		float px = 1 / 32f;
+		int thumbX, thumbY, thumbXOffset;
+
+		if (axis == Axis.VERTICAL) {
+			thumbX = x + width / 2 - THUMB_SIZE / 2;
+			thumbY = y + height - THUMB_SIZE + 1 - (int) (coordToValueRatio * (value - min));
+			thumbXOffset = 0;
+		} else {
+			thumbX = x + (int) (coordToValueRatio * (value - min));
+			thumbY = y + height / 2 - THUMB_SIZE / 2;
+			thumbXOffset = 8;
+		}
 
-			ScreenDrawing.rect(TEXTURE, thumbX, y + height / 2 - THUMB_SIZE / 2, THUMB_SIZE, THUMB_SIZE, 8*px, 8*px, 16*px, 16*px, 0xFFFFFFFF);
+		// FIXME: Ugly, I really should remove this
+		if (dragging) {
+			if (GLFW.glfwGetMouseButton(MinecraftClient.getInstance().window.getHandle(), GLFW.GLFW_MOUSE_BUTTON_1) == GLFW.GLFW_PRESS) {
+				onMouseDrag(mouseX - x, mouseY - y, 0);
+			} else {
+				onMouseUp(mouseX - x, mouseY - y, 0);
+			}
 		}
+
+		// thumbState values:
+		// 0: default, 1: dragging, 2: hovered
+		int thumbState = dragging ? 1 : (mouseX >= thumbX && mouseX <= thumbX + THUMB_SIZE && mouseY >= thumbY && mouseY <= thumbY + THUMB_SIZE ? 2 : 0);
+		ScreenDrawing.rect(TEXTURE, thumbX, thumbY, THUMB_SIZE, THUMB_SIZE, thumbXOffset*px, 0*px + thumbState * 8*px, (thumbXOffset + 8)*px, 8*px + thumbState * 8*px, 0xFFFFFFFF);
+
+		super.paintForeground(x, y, mouseX, mouseY);
 	}
 
 	public int getValue() {
diff --git a/src/main/resources/assets/libgui/textures/widget/slider.png b/src/main/resources/assets/libgui/textures/widget/slider.png
index d4e2eda..d118877 100644
--- a/src/main/resources/assets/libgui/textures/widget/slider.png
+++ b/src/main/resources/assets/libgui/textures/widget/slider.png