Merge pull request #59 from ConsoleLogLuke/toggle-selection-gui

Make emoji selection GUI togglable by re-clicking the button
InnovativeOnlineIndustries · Oct 29, 2022 · f094178 · f094178
2 parents b9fd049 + 720207f
commit f094178
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Common/src/main/java/com/hrznstudio/emojiful/gui/EmojiSelectionGui.java b/Common/src/main/java/com/hrznstudio/emojiful/gui/EmojiSelectionGui.java
@@ -123,6 +123,11 @@ public void render(PoseStack stack) {
 
     @Override
     public boolean mouseClicked(double mouseX, double mouseY, int p_231044_5_) {
+        if (openSelectionArea.contains((int) mouseX, (int) mouseY)) {
+            toggleSelectionArea();
+            return true;
+        }
+
         if (this.showingSelectionArea) {
             fieldWidget.setFocus(textFieldRectangle.contains((int) mouseX, (int) mouseY));
             if (categorySelectionArea.contains((int) mouseX, (int) mouseY)) {
@@ -161,11 +166,6 @@ public boolean mouseClicked(double mouseX, double mouseY, int p_231044_5_) {
                 }
                 return true;
             }
-        } else {
-            if (openSelectionArea.contains((int) mouseX, (int) mouseY)) {
-                showSelectionArea();
-                return true;
-            }
         }
         return false;
     }
@@ -201,7 +201,7 @@ public void drawRectangle(PoseStack stack, Rect2i rectangle2d, int value) {
         GuiComponent.fill(stack, rectangle2d.getX(), rectangle2d.getY(), rectangle2d.getX() + rectangle2d.getWidth(), rectangle2d.getY() + rectangle2d.getHeight(), value);
     }
 
-    public void showSelectionArea() {
+    public void toggleSelectionArea() {
         Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
         showingSelectionArea = !showingSelectionArea;
     }