From 1623c0f8800b384daf1ed8df47bb6b66aa648d74 Mon Sep 17 00:00:00 2001 From: comp500 Date: Sat, 10 Aug 2019 20:08:02 +0100 Subject: [PATCH] Correct dialog parentage --- .../link/infra/packwiz/installer/ui/InstallWindow.java | 2 +- .../infra/packwiz/installer/ui/OptionsSelectWindow.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java b/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java index 8d5662d..67856a3 100644 --- a/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java +++ b/src/main/java/link/infra/packwiz/installer/ui/InstallWindow.java @@ -166,7 +166,7 @@ public class InstallWindow implements IUserInterface { public Future showOptions(List opts) { CompletableFuture future = new CompletableFuture<>(); EventQueue.invokeLater(() -> { - OptionsSelectWindow dialog = new OptionsSelectWindow(opts, future); + OptionsSelectWindow dialog = new OptionsSelectWindow(opts, future, frmPackwizlauncher); dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); dialog.setVisible(true); }); diff --git a/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java b/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java index 3db2536..0362d4e 100644 --- a/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java +++ b/src/main/java/link/infra/packwiz/installer/ui/OptionsSelectWindow.java @@ -25,12 +25,13 @@ public class OptionsSelectWindow extends JDialog implements ActionListener { /** * Create the dialog. */ - OptionsSelectWindow(List optList, CompletableFuture future) { + OptionsSelectWindow(List optList, CompletableFuture future, JFrame parentWindow) { + super(parentWindow, "Select optional mods...", true); + tableModel = new OptionTableModel(optList); this.future = future; - setModal(true); - setTitle("Select optional mods..."); + setLocationRelativeTo(parentWindow); setBounds(100, 100, 450, 300); getContentPane().setLayout(new BorderLayout()); JPanel contentPanel = new JPanel();