From 2b1ef25f9656e49fb582ec7ad23a90f82c506ff1 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Tue, 10 Jul 2018 18:30:18 +0200
Subject: [PATCH] Fixed file select sppearing behind the window when
 experimental skin drop is disabled

---
 .../voxelmodpack/hdskins/gui/GuiSkins.java    |  2 +-
 .../hdskins/upload/awt/InternalDialog.java    | 40 +++++++++++++++++++
 .../hdskins/upload/awt/ThreadOpenFile.java    | 16 +++-----
 3 files changed, 47 insertions(+), 11 deletions(-)
 create mode 100644 src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java

diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
index 4d591a9c..616854be 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
@@ -269,7 +269,7 @@ public class GuiSkins extends GuiScreen implements FutureCallback<SkinUploadResp
                     this.selectedSkin = null;
                     this.localPlayer.releaseTextures();
                     this.openFileThread = new ThreadOpenFilePNG(this.mc, I18n.format("hdskins.open.title"), this::onFileOpenDialogClosed);
-                    this.openFileThread.setParent(GLWindow.current().getFrame()).start();
+                    this.openFileThread.start();
                     guiButton.enabled = false;
                 }
 
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java
new file mode 100644
index 00000000..55f9fcb1
--- /dev/null
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/InternalDialog.java
@@ -0,0 +1,40 @@
+package com.voxelmodpack.hdskins.upload.awt;
+
+import javax.swing.JFrame;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import com.voxelmodpack.hdskins.gui.GLWindow;
+
+final class InternalDialog {
+
+    private static final Logger LOGGER = LogManager.getLogger();
+
+    private static JFrame hiddenFrame;
+
+    public static JFrame getAWTContext() {
+        JFrame context = GLWindow.current().getFrame();
+
+        if (context != null) {
+            return context;
+        }
+
+        if (hiddenFrame == null) {
+            hiddenFrame = new JFrame("InternalDialogue");
+            hiddenFrame.setVisible(false);
+            hiddenFrame.requestFocusInWindow();
+            hiddenFrame.requestFocus();
+
+            try {
+                if (hiddenFrame.isAlwaysOnTopSupported()) {
+                    hiddenFrame.setAlwaysOnTop(true);
+                }
+            } catch (SecurityException e) {
+                LOGGER.fatal("Could not set window on top state. This is probably Forge's fault.", e);
+            }
+        }
+
+        return hiddenFrame;
+    }
+}
diff --git a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
index 56bb34ce..51502a90 100644
--- a/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
+++ b/src/hdskins/java/com/voxelmodpack/hdskins/upload/awt/ThreadOpenFile.java
@@ -5,7 +5,6 @@ import net.minecraft.client.Minecraft;
 import java.io.File;
 
 import javax.swing.JFileChooser;
-import javax.swing.JFrame;
 import javax.swing.filechooser.FileFilter;
 
 /**
@@ -24,8 +23,6 @@ public abstract class ThreadOpenFile extends Thread {
 
     private JFileChooser fileDialog;
 
-    private JFrame parent = null;
-
     private static String lastChosenFile = null;
 
     protected ThreadOpenFile(Minecraft minecraft, String dialogTitle, IOpenFileCallback callback)
@@ -38,11 +35,6 @@ public abstract class ThreadOpenFile extends Thread {
         this.dialogTitle = dialogTitle;
     }
 
-    public ThreadOpenFile setParent(JFrame parent) {
-        this.parent = parent;
-        return this;
-    }
-
     @Override
     public void run() {
         fileDialog = new JFileChooser();
@@ -53,9 +45,13 @@ public abstract class ThreadOpenFile extends Thread {
         }
         fileDialog.setFileFilter(this.getFileFilter());
 
-        int dialogResult = fileDialog.showOpenDialog(parent);
+        int dialogResult = fileDialog.showOpenDialog(InternalDialog.getAWTContext());
 
-        lastChosenFile = fileDialog.getSelectedFile().getAbsolutePath();
+        File f = fileDialog.getSelectedFile();
+
+        if (f != null) {
+            lastChosenFile = f.getAbsolutePath();
+        }
 
         this.parentScreen.onFileOpenDialogClosed(fileDialog, dialogResult);
     }