From 8c4c9a46ba6988522758e3c66d74794263e4985a Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <reinhard.pointner@gmail.com>
Date: Sun, 16 Oct 2016 16:49:06 +0800
Subject: [PATCH] Port to MigLayout 5.0

---
 ivy.xml                                          | 2 +-
 source/net/filebot/ui/AbstractSearchPanel.java   | 2 +-
 source/net/filebot/ui/SelectButtonTextField.java | 6 +++---
 source/net/filebot/ui/SelectDialog.java          | 6 +++---
 source/net/filebot/ui/sfv/SfvPanel.java          | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ivy.xml b/ivy.xml
index 61633006..f54de9b6 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -16,7 +16,7 @@
 		<dependency org="commons-net" name="commons-net" rev="3.+" />
 		<dependency org="org.slf4j" name="slf4j-jdk14" rev="1.+" />
 		<dependency org="net.java.dev.glazedlists" name="glazedlists_java15" rev="1.+" />
-		<dependency org="com.miglayout" name="miglayout-swing" rev="4.+" />
+		<dependency org="com.miglayout" name="miglayout-swing" rev="5.+" />
 		<dependency org="org.apache.commons" name="commons-vfs2" rev="2.+" />
 		<dependency org="com.github.junrar" name="junrar" rev="0.+" />
 		<dependency org="com.fifesoft" name="rsyntaxtextarea" rev="2.+" />
diff --git a/source/net/filebot/ui/AbstractSearchPanel.java b/source/net/filebot/ui/AbstractSearchPanel.java
index 92a5e580..d4fd982a 100644
--- a/source/net/filebot/ui/AbstractSearchPanel.java
+++ b/source/net/filebot/ui/AbstractSearchPanel.java
@@ -63,7 +63,7 @@ public abstract class AbstractSearchPanel<S, E> extends JComponent {
 
 		tabbedPaneGroup.setBorder(BorderFactory.createTitledBorder("Search Results"));
 		tabbedPaneGroup.add(tabbedPane, "grow, wrap");
-		setLayout(new MigLayout("nogrid, fill, insets 10px 10px 15px 10px", "align 45%", "[pref!]10px[fill]"));
+		setLayout(new MigLayout("nogrid, novisualpadding, fill, insets 10px 10px 15px 10px", "align 45%", "[pref!]10px[fill]"));
 
 		add(searchTextField);
 		add(new JButton(searchAction), "gap 16px, h 2+pref!, id search, sgy button");
diff --git a/source/net/filebot/ui/SelectButtonTextField.java b/source/net/filebot/ui/SelectButtonTextField.java
index 973cd638..e7a5ba47 100644
--- a/source/net/filebot/ui/SelectButtonTextField.java
+++ b/source/net/filebot/ui/SelectButtonTextField.java
@@ -47,9 +47,9 @@ public class SelectButtonTextField<T> extends JComponent {
 
 		editor.setBorder(BorderFactory.createMatteBorder(1, 0, 1, 1, ((LineBorder) selectButton.getBorder()).getLineColor()));
 
-		setLayout(new MigLayout("nogrid, fill"));
-		add(selectButton, "h pref!, w pref!, sizegroupy this");
-		add(editor, "gap 0, w 195px!, sizegroupy this");
+		setLayout(new MigLayout("fill, nogrid, novisualpadding"));
+		add(selectButton, "h pref!, w pref!, sizegroupy editor");
+		add(editor, "gap 0, w 195px!, sizegroupy editor");
 
 		editor.setPrototypeDisplayValue("X");
 		editor.setRenderer(new CompletionCellRenderer());
diff --git a/source/net/filebot/ui/SelectDialog.java b/source/net/filebot/ui/SelectDialog.java
index bb5ba646..ea382c62 100644
--- a/source/net/filebot/ui/SelectDialog.java
+++ b/source/net/filebot/ui/SelectDialog.java
@@ -69,12 +69,12 @@ public class SelectDialog<T> extends JDialog {
 		list.addMouseListener(mouseListener);
 
 		JComponent c = (JComponent) getContentPane();
-		c.setLayout(new MigLayout("insets 1.5mm 1.5mm 2.7mm 1.5mm, nogrid, fill", "", header == null ? "[pref!][fill][pref!]" : "[pref!][pref!][fill][pref!]"));
+		c.setLayout(new MigLayout("insets 1.5mm 1.5mm 2.7mm 1.5mm, nogrid, novisualpadding, fill", "", header == null ? "[pref!][fill][pref!]" : "[min!][min!][fill][pref!]"));
 
 		if (header != null) {
-			c.add(header, "wmin 150px, growx, wrap");
+			c.add(header, "wmin 150px, hmin pref, growx, wrap");
 		}
-		c.add(messageLabel, "wmin 150px, growx, wrap");
+		c.add(messageLabel, "wmin 150px, hmin pref, growx, wrap");
 		c.add(new JScrollPane(list), "wmin 150px, hmin 150px, grow, wrap 2mm");
 
 		c.add(new JButton(selectAction), "align center, id select");
diff --git a/source/net/filebot/ui/sfv/SfvPanel.java b/source/net/filebot/ui/sfv/SfvPanel.java
index baac1ae2..2c518a66 100644
--- a/source/net/filebot/ui/sfv/SfvPanel.java
+++ b/source/net/filebot/ui/sfv/SfvPanel.java
@@ -54,7 +54,7 @@ public class SfvPanel extends JComponent {
 	public SfvPanel() {
 		table.setTransferHandler(new DefaultTransferHandler(transferablePolicy, exportHandler));
 
-		JPanel contentPane = new JPanel(new MigLayout("insets 0, nogrid, fill", "", "[fill]10px[bottom, pref!]4px"));
+		JPanel contentPane = new JPanel(new MigLayout("insets 0, nogrid, novisualpadding, fill", "", "[fill]10px[bottom, pref!]4px"));
 		contentPane.setBorder(new TitledBorder("SFV"));
 
 		setLayout(new MigLayout("insets dialog, fill"));