From 8c0372e4bc02bc4bd67b7917934894eea1494e11 Mon Sep 17 00:00:00 2001
From: Frank <developer@ambertation.de>
Date: Tue, 19 Jul 2022 18:06:19 +0200
Subject: [PATCH] [Fix] Hover did no longer change

---
 .../ui/layout/components/ColorPicker.java     |  5 ++
 .../betterx/ui/layout/components/Empty.java   |  5 ++
 .../betterx/ui/layout/components/Image.java   |  5 ++
 .../betterx/ui/layout/components/Input.java   |  5 ++
 .../ui/layout/components/MultiLineText.java   |  5 ++
 .../betterx/ui/layout/components/Panel.java   |  4 +
 .../betterx/ui/layout/components/Text.java    |  5 +-
 .../ui/layout/components/VerticalScroll.java  | 80 ++++++++++++-------
 .../input/RelativeContainerEventHandler.java  | 10 +++
 9 files changed, 96 insertions(+), 28 deletions(-)

diff --git a/src/main/java/org/betterx/ui/layout/components/ColorPicker.java b/src/main/java/org/betterx/ui/layout/components/ColorPicker.java
index d04b2810..ce1ac94b 100644
--- a/src/main/java/org/betterx/ui/layout/components/ColorPicker.java
+++ b/src/main/java/org/betterx/ui/layout/components/ColorPicker.java
@@ -39,4 +39,9 @@ public class ColorPicker extends HorizontalStack {
     public int getContentHeight() {
         return Math.max(swatch.getContentHeight(), input.getContentHeight());
     }
+
+    @Override
+    public boolean changeFocus(boolean bl) {
+        return input.changeFocus(bl);
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/Empty.java b/src/main/java/org/betterx/ui/layout/components/Empty.java
index bed8da94..fca87bfd 100644
--- a/src/main/java/org/betterx/ui/layout/components/Empty.java
+++ b/src/main/java/org/betterx/ui/layout/components/Empty.java
@@ -24,4 +24,9 @@ public class Empty extends LayoutComponent<NullRenderer, Empty> {
     public int getContentHeight() {
         return 0;
     }
+
+    @Override
+    public boolean isMouseOver(double d, double e) {
+        return false;
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/Image.java b/src/main/java/org/betterx/ui/layout/components/Image.java
index 5b9f3313..da61f8f0 100644
--- a/src/main/java/org/betterx/ui/layout/components/Image.java
+++ b/src/main/java/org/betterx/ui/layout/components/Image.java
@@ -112,4 +112,9 @@ public class Image extends CustomRenderComponent {
                 size.height()
         );
     }
+
+    @Override
+    public boolean isMouseOver(double d, double e) {
+        return false;
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/Input.java b/src/main/java/org/betterx/ui/layout/components/Input.java
index e06e59b2..6e599aba 100644
--- a/src/main/java/org/betterx/ui/layout/components/Input.java
+++ b/src/main/java/org/betterx/ui/layout/components/Input.java
@@ -83,4 +83,9 @@ public class Input extends AbstractVanillaComponent<EditBox, Input> {
     protected Component contentComponent() {
         return Component.literal(initialValue + "..");
     }
+
+    @Override
+    public boolean changeFocus(boolean bl) {
+        return super.changeFocus(bl);
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/MultiLineText.java b/src/main/java/org/betterx/ui/layout/components/MultiLineText.java
index ea98d178..ac1dc0d0 100644
--- a/src/main/java/org/betterx/ui/layout/components/MultiLineText.java
+++ b/src/main/java/org/betterx/ui/layout/components/MultiLineText.java
@@ -97,4 +97,9 @@ public class MultiLineText extends LayoutComponent<MultiLineText.MultiLineTextRe
             }
         }
     }
+
+    @Override
+    public boolean isMouseOver(double d, double e) {
+        return false;
+    }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/Panel.java b/src/main/java/org/betterx/ui/layout/components/Panel.java
index 07e022e7..cbc5d76c 100644
--- a/src/main/java/org/betterx/ui/layout/components/Panel.java
+++ b/src/main/java/org/betterx/ui/layout/components/Panel.java
@@ -102,6 +102,10 @@ public class Panel implements ComponentWithBounds, RelativeContainerEventHandler
 
     @Override
     public boolean isMouseOver(double x, double y) {
+        if (child != null) {
+            if (child.isMouseOver(x - bounds.left, y - bounds.top))
+                return true;
+        }
         return bounds.contains(x, y);
     }
 
diff --git a/src/main/java/org/betterx/ui/layout/components/Text.java b/src/main/java/org/betterx/ui/layout/components/Text.java
index b22b4abc..165bd398 100644
--- a/src/main/java/org/betterx/ui/layout/components/Text.java
+++ b/src/main/java/org/betterx/ui/layout/components/Text.java
@@ -74,7 +74,10 @@ public class Text extends LayoutComponent<Text.TextRenderer, Text> {
                 GuiComponent.drawString(stack, getFont(), linkedComponent.text, left, top, linkedComponent.color);
             }
         }
+    }
 
-
+    @Override
+    public boolean isMouseOver(double d, double e) {
+        return false;
     }
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
index ff338734..41edd1a4 100644
--- a/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
+++ b/src/main/java/org/betterx/ui/layout/components/VerticalScroll.java
@@ -9,12 +9,17 @@ import org.betterx.ui.layout.values.Value;
 import org.betterx.ui.vanilla.VanillaScrollerRenderer;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.components.events.ContainerEventHandler;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
+import java.util.List;
+import org.jetbrains.annotations.Nullable;
+
 @Environment(EnvType.CLIENT)
-public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRenderer> extends LayoutComponent<R, VerticalScroll<R, RS>> {
+public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRenderer> extends LayoutComponent<R, VerticalScroll<R, RS>> implements ContainerEventHandler {
     protected LayoutComponent<?, ?> child;
     protected final RS scrollerRenderer;
     protected Rectangle viewBounds;
@@ -53,8 +58,11 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
         return res;
     }
 
+    List<LayoutComponent<?, ?>> children = List.of();
+
     public void setChild(LayoutComponent<?, ?> c) {
         this.child = c;
+        children = List.of(child);
     }
 
     @Override
@@ -132,7 +140,7 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
                 poseStack.translate(0, scrollerOffset(), 0);
                 setClippingRect(clipRect);
                 child.render(
-                        poseStack, mouseX, mouseY, deltaTicks,
+                        poseStack, mouseX, mouseY - scrollerOffset(), deltaTicks,
                         renderBounds.movedBy(0, scrollerOffset(), scrollerWidth(), 0),
                         clipRect
                 );
@@ -177,7 +185,12 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
     @Override
     public void mouseMoved(double x, double y) {
         if (child != null && relativeBounds.contains(x, y))
-            child.mouseMoved(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset());
+            ContainerEventHandler.super.mouseMoved(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset());
+    }
+
+    @Override
+    public List<? extends GuiEventListener> children() {
+        return children;
     }
 
     @Override
@@ -192,7 +205,11 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
         }
 
         if (child != null && relativeBounds.contains(x, y))
-            return child.mouseClicked(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset(), button);
+            return ContainerEventHandler.super.mouseClicked(
+                    x - relativeBounds.left,
+                    y - relativeBounds.top - scrollerOffset(),
+                    button
+            );
         return false;
     }
 
@@ -200,7 +217,11 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
     public boolean mouseReleased(double x, double y, int button) {
         mouseDown = false;
         if (child != null && relativeBounds.contains(x, y))
-            return child.mouseReleased(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset(), button);
+            return ContainerEventHandler.super.mouseReleased(
+                    x - relativeBounds.left,
+                    y - relativeBounds.top - scrollerOffset(),
+                    button
+            );
         return false;
     }
 
@@ -212,7 +233,7 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
             return true;
         }
         if (child != null && relativeBounds.contains(x, y))
-            return child.mouseDragged(
+            return ContainerEventHandler.super.mouseDragged(
                     x - relativeBounds.left,
                     y - relativeBounds.top - scrollerOffset(),
                     button,
@@ -227,7 +248,11 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
     public boolean mouseScrolled(double x, double y, double delta) {
         boolean didCapture = false;
         if (child != null && relativeBounds.contains(x, y)) {
-            didCapture = child.mouseScrolled(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset(), delta);
+            didCapture = ContainerEventHandler.super.mouseScrolled(
+                    x - relativeBounds.left,
+                    y - relativeBounds.top - scrollerOffset(),
+                    delta
+            );
         }
         if (!didCapture) {
             scrollerY = scrollerY + delta;
@@ -236,36 +261,37 @@ public class VerticalScroll<R extends ComponentRenderer, RS extends ScrollerRend
         return false;
     }
 
-    @Override
-    public boolean keyPressed(int i, int j, int k) {
-        if (child != null)
-            return child.keyPressed(i, j, k);
-        return false;
+
+    GuiEventListener focused;
+
+    @Nullable
+    public GuiEventListener getFocused() {
+        return focused;
     }
 
-    @Override
-    public boolean keyReleased(int i, int j, int k) {
-        if (child != null)
-            return child.keyReleased(i, j, k);
-        return false;
+    public void setFocused(@Nullable GuiEventListener guiEventListener) {
+        focused = guiEventListener;
     }
 
-    @Override
-    public boolean charTyped(char c, int i) {
-        if (child != null)
-            return child.charTyped(c, i);
-        return false;
+    boolean dragging;
+
+    public boolean isDragging() {
+        return this.dragging;
     }
 
-    @Override
-    public boolean changeFocus(boolean bl) {
-        if (child != null)
-            return child.changeFocus(bl);
-        return false;
+    public void setDragging(boolean bl) {
+        dragging = bl;
     }
 
+
     @Override
     public boolean isMouseOver(double x, double y) {
+        if (child != null) {
+            if (child.isMouseOver(x - relativeBounds.left, y - relativeBounds.top - scrollerOffset()))
+                return true;
+        }
         return relativeBounds.contains(x, y);
     }
+
+
 }
diff --git a/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java b/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
index ed08376b..655d813f 100644
--- a/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
+++ b/src/main/java/org/betterx/ui/layout/components/input/RelativeContainerEventHandler.java
@@ -38,5 +38,15 @@ public interface RelativeContainerEventHandler extends ContainerEventHandler {
         Rectangle r = getInputBounds();
         return ContainerEventHandler.super.mouseScrolled(d - r.left, e - r.top, f);
     }
+
+    default boolean isMouseOver(double x, double y) {
+        Rectangle r = getInputBounds();
+        boolean res = false;
+        for (GuiEventListener c : children()) {
+            res |= c.isMouseOver(x - r.left, y - r.top);
+        }
+
+        return res || r.contains(x, y);
+    }
 }