From d6c03644b8c08be488538582dda06df7a29faea1 Mon Sep 17 00:00:00 2001
From: CrushedPixel <crushedpixelmaps@gmail.com>
Date: Sun, 19 Jul 2015 14:42:12 +0200
Subject: [PATCH] Created GuiOutsideClickableElement interface for GuiElements
 that can be deselected/closed by clicking outside of them and properly
 forward mouse clicks to these elements

---
 .../replaymod/gui/elements/ComposedElement.java          | 9 +++++++--
 .../replaymod/gui/elements/GuiAdvancedTextField.java     | 2 +-
 .../replaymod/gui/elements/GuiColorPicker.java           | 2 +-
 .../replaymod/gui/elements/GuiFileChooser.java           | 2 +-
 .../gui/elements/GuiOutsideClickableElement.java         | 8 ++++++++
 .../crushedpixel/replaymod/gui/elements/GuiTextArea.java | 2 +-
 6 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiOutsideClickableElement.java

diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java
index bf9188b3..f8fc4eff 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/ComposedElement.java
@@ -66,8 +66,13 @@ public class ComposedElement implements GuiElement {
         boolean clicked = false;
         //iterate over elements in reverse order to first handle mouse clicks of elements that are drawn on top
         for (int i=0; i<parts.size(); i++) {
-            clicked = parts.get(parts.size()-1-i).mouseClick(mc, mouseX, mouseY, button);
-            if(clicked) break;
+            GuiElement part = parts.get(parts.size() - 1 - i);
+
+            //if GuiOutsideClickableElement, forward mouse clicks outside of that element
+            if(!clicked || (part instanceof GuiOutsideClickableElement && !part.isHovering(mouseX, mouseY))) {
+                boolean cl = part.mouseClick(mc, mouseX, mouseY, button);
+                if(cl) clicked = cl;
+            }
         }
         return clicked;
     }
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java
index 89b01257..8b8f943e 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiAdvancedTextField.java
@@ -7,7 +7,7 @@ import net.minecraft.client.gui.GuiTextField;
 
 import java.awt.*;
 
-public class GuiAdvancedTextField extends GuiTextField implements GuiElement {
+public class GuiAdvancedTextField extends GuiTextField implements GuiElement, GuiOutsideClickableElement {
     public String hint;
     public int hintTextColor = Color.DARK_GRAY.getRGB();
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiColorPicker.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiColorPicker.java
index 22a096ac..ffd83e4e 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiColorPicker.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiColorPicker.java
@@ -9,7 +9,7 @@ import org.lwjgl.util.Point;
 
 import java.awt.*;
 
-public class GuiColorPicker extends GuiAdvancedButton implements GuiOverlayElement {
+public class GuiColorPicker extends GuiAdvancedButton implements GuiOverlayElement, GuiOutsideClickableElement {
 
     private final int PICKER_SIZE = 100;
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiFileChooser.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiFileChooser.java
index 3addc483..a2bb931b 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiFileChooser.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiFileChooser.java
@@ -11,7 +11,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class GuiFileChooser extends GuiAdvancedButton {
+public class GuiFileChooser extends GuiAdvancedButton implements GuiOutsideClickableElement {
 
     private final Minecraft mc = Minecraft.getMinecraft();
 
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiOutsideClickableElement.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiOutsideClickableElement.java
new file mode 100644
index 00000000..d17a33a8
--- /dev/null
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiOutsideClickableElement.java
@@ -0,0 +1,8 @@
+package eu.crushedpixel.replaymod.gui.elements;
+
+/**
+ * A dummy interface which all Gui Elements that can be unfocused (or closed)
+ * by clicking outside of their bounds have to implement
+ */
+public interface GuiOutsideClickableElement {
+}
diff --git a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java
index ad427edb..8cfbfa04 100644
--- a/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java
+++ b/src/main/java/eu/crushedpixel/replaymod/gui/elements/GuiTextArea.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
 import static net.minecraft.client.renderer.GlStateManager.*;
 import static net.minecraft.util.MathHelper.clamp_int;
 
-public class GuiTextArea extends Gui implements GuiElement {
+public class GuiTextArea extends Gui implements GuiElement, GuiOutsideClickableElement {
 
     // Constants
     protected static final int BORDER = 4;