From c5917e9854958adf1e4aa1aa22251f7b3f911d38 Mon Sep 17 00:00:00 2001
From: isXander <xandersmith2008@gmail.com>
Date: Wed, 29 Mar 2023 17:11:24 +0100
Subject: Fix buttons stuck focusing after clicking the mouse.

---
 build.gradle.kts                                             |  2 +-
 changelogs/2.3.1.md                                          |  1 +
 .../java/dev/isxander/yacl/gui/ElementListWidgetExt.java     | 12 ++++++++++++
 src/client/java/dev/isxander/yacl/gui/OptionListWidget.java  |  7 +++++++
 .../dev/isxander/yacl/gui/controllers/BooleanController.java |  2 +-
 5 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 changelogs/2.3.1.md

diff --git a/build.gradle.kts b/build.gradle.kts
index 1d0d437..ac28484 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
 val ciRun = System.getenv().containsKey("GITHUB_ACTIONS")
 
 group = "dev.isxander"
-version = "2.3.0"
+version = "2.3.1"
 
 if (ciRun)
     version = "$version+${grgit.branch.current().name.replace('/', '.')}-SNAPSHOT"
diff --git a/changelogs/2.3.1.md b/changelogs/2.3.1.md
new file mode 100644
index 0000000..13b4bd5
--- /dev/null
+++ b/changelogs/2.3.1.md
@@ -0,0 +1 @@
+- Fix buttons stuck focusing after clicking the mouse.
diff --git a/src/client/java/dev/isxander/yacl/gui/ElementListWidgetExt.java b/src/client/java/dev/isxander/yacl/gui/ElementListWidgetExt.java
index e28509e..07f5635 100644
--- a/src/client/java/dev/isxander/yacl/gui/ElementListWidgetExt.java
+++ b/src/client/java/dev/isxander/yacl/gui/ElementListWidgetExt.java
@@ -3,6 +3,7 @@ package dev.isxander.yacl.gui;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.ContainerObjectSelectionList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.util.Mth;
 import org.jetbrains.annotations.Nullable;
 
@@ -92,6 +93,17 @@ public class ElementListWidgetExt<E extends ElementListWidgetExt.Entry<E>> exten
         return null;
     }
 
+    @Override
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        // on mouseClicked, the clicked element becomes focused so you can drag. on release, we should clear the focus
+        boolean clicked = super.mouseReleased(mouseX, mouseY, button);
+        if (getFocused() != null) {
+            this.getFocused().setFocused(null);
+            this.setFocused(null);
+        }
+        return clicked;
+    }
+
     /*
       below code is licensed from cloth-config under LGPL3
       modified to inherit vanilla's EntryListWidget and use yarn mappings
diff --git a/src/client/java/dev/isxander/yacl/gui/OptionListWidget.java b/src/client/java/dev/isxander/yacl/gui/OptionListWidget.java
index 097f076..333d67c 100644
--- a/src/client/java/dev/isxander/yacl/gui/OptionListWidget.java
+++ b/src/client/java/dev/isxander/yacl/gui/OptionListWidget.java
@@ -149,6 +149,13 @@ public class OptionListWidget extends ElementListWidgetExt<OptionListWidget.Entr
         return super.mouseClicked(mouseX, mouseY, button);
     }
 
+    @Override
+    public void mouseMoved(double mouseX, double mouseY) {
+        if (getFocused() instanceof OptionEntry optionEntry)
+            optionEntry.widget.unfocus();
+        setFocused(null);
+    }
+
     @Override
     public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
         super.mouseScrolled(mouseX, mouseY, amount);
diff --git a/src/client/java/dev/isxander/yacl/gui/controllers/BooleanController.java b/src/client/java/dev/isxander/yacl/gui/controllers/BooleanController.java
index d97b418..d7d17d5 100644
--- a/src/client/java/dev/isxander/yacl/gui/controllers/BooleanController.java
+++ b/src/client/java/dev/isxander/yacl/gui/controllers/BooleanController.java
@@ -142,7 +142,7 @@ public class BooleanController implements Controller<Boolean> {
 
         @Override
         public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
-            if (!focused) {
+            if (!isFocused()) {
                 return false;
             }
 
-- 
cgit