Fixed widgets registering clicks when not visible (Someone PR this to meteor frfr)

(cherry picked from commit b379c1c)

Author: X-C-0

src/main/java/me/pindour/catpuccin/gui/themes/catpuccin/widgets/WCatpuccinSection.java

@@ -6,9 +6,12 @@
 import me.pindour.catpuccin.gui.themes.catpuccin.CatpuccinGuiTheme;
 import me.pindour.catpuccin.gui.themes.catpuccin.CatpuccinWidget;
 import me.pindour.catpuccin.gui.themes.catpuccin.icons.CatpuccinIcons;
+import me.pindour.catpuccin.mixininterface.IWContainer;
+import me.pindour.catpuccin.utils.WidgetUtils;
 import meteordevelopment.meteorclient.gui.renderer.GuiRenderer;
 import meteordevelopment.meteorclient.gui.widgets.WWidget;
 import meteordevelopment.meteorclient.gui.widgets.containers.WSection;
+import meteordevelopment.meteorclient.gui.widgets.containers.WView;
 import meteordevelopment.meteorclient.utils.render.color.Color;
 
 public class WCatpuccinSection extends WSection implements CatpuccinWidget {
@@ -74,6 +77,15 @@ protected void renderWidget(WWidget widget, GuiRenderer renderer, double mouseX,
         }
     }
 
+    @Override
+    protected boolean propagateEvents(WWidget widget) {
+        WView parentView = ((IWContainer)this).catpuccin$getParentView();
+
+        if (parentView == null) parentView = WidgetUtils.findParentView(this);
+
+        return (expanded || widget instanceof WHeader) && WidgetUtils.isWidgetInside(widget, parentView);
+    }
+
     @Override
     public void setExpanded(boolean expanded) {
         super.setExpanded(expanded);

src/main/java/me/pindour/catpuccin/mixin/meteorclient/WContainerMixin.java

@@ -0,0 +1,31 @@
+package me.pindour.catpuccin.mixin.meteorclient;
+
+import me.pindour.catpuccin.mixininterface.IWContainer;
+import me.pindour.catpuccin.utils.WidgetUtils;
+import meteordevelopment.meteorclient.gui.widgets.WWidget;
+import meteordevelopment.meteorclient.gui.widgets.containers.WContainer;
+import meteordevelopment.meteorclient.gui.widgets.containers.WView;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+@Mixin(value = WContainer.class, remap = false)
+public abstract class WContainerMixin extends WWidget implements IWContainer {
+
+    @Unique
+    WView parentView;
+
+    @Inject(method = "propagateEvents", at = @At("HEAD"), cancellable = true)
+    private void onPropagateEvents(WWidget widget, CallbackInfoReturnable<Boolean> cir) {
+        // There's probably a better way to do this, but initializing parent view on widget init is too early so deal with it
+        if (parentView == null) parentView = WidgetUtils.findParentView(this);
+        if (parentView != null) cir.setReturnValue(WidgetUtils.isWidgetInside(widget, parentView));
+    }
+
+    @Override
+    public WView catpuccin$getParentView() {
+        return parentView;
+    }
+}

src/main/java/me/pindour/catpuccin/mixininterface/IWContainer.java

@@ -0,0 +1,7 @@
+package me.pindour.catpuccin.mixininterface;
+
+import meteordevelopment.meteorclient.gui.widgets.containers.WView;
+
+public interface IWContainer {
+    WView catpuccin$getParentView();
+}

src/main/java/me/pindour/catpuccin/utils/WidgetUtils.java

@@ -0,0 +1,32 @@
+package me.pindour.catpuccin.utils;
+
+import me.pindour.catpuccin.mixininterface.IWContainer;
+import meteordevelopment.meteorclient.gui.widgets.WWidget;
+import meteordevelopment.meteorclient.gui.widgets.containers.WContainer;
+import meteordevelopment.meteorclient.gui.widgets.containers.WView;
+import meteordevelopment.meteorclient.gui.widgets.containers.WWindow;
+import org.jetbrains.annotations.Nullable;
+
+public class WidgetUtils {
+    public static boolean isWidgetInside(WWidget inner, WWidget outer) {
+        if (inner == null || outer == null) return true;
+        return ((inner.y >= outer.y && inner.y <= outer.y + outer.height) ||
+                (inner.y + inner.height >= outer.y && inner.y + inner.height <= outer.y + outer.height)) ||
+                ((outer.y >= inner.y && outer.y <= inner.y + inner.height) ||
+                        (outer.y + outer.height >= inner.y && outer.y + outer.height <= inner.y + inner.height));
+    }
+
+    @Nullable
+    public static WView findParentView(WWidget widget) {
+        return switch (widget) {
+            case null -> null;
+            case WView view -> view;
+            case WWindow window -> window.view;
+            case WContainer container -> {
+                WView view = ((IWContainer)container).catpuccin$getParentView();
+                yield  view != null ? view : findParentView(widget.parent);
+            }
+            default -> findParentView(widget.parent);
+        };
+    }
+}

src/main/resources/catpuccin.mixins.json

@@ -10,6 +10,7 @@
   "mixins": [
     "meteorclient.FontsMixin",
     "meteorclient.GuiRendererMixin",
+    "meteorclient.WContainerMixin",
     "meteorclient.WHeaderMixin"
   ]
 }