|
@@ -47,23 +47,23 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
|
47
|
47
|
import com.dmdirc.ui.CoreUIUtils;
|
48
|
48
|
import com.dmdirc.util.collections.QueuedLinkedHashSet;
|
49
|
49
|
|
|
50
|
+import java.awt.BorderLayout;
|
50
|
51
|
import java.awt.Dialog;
|
51
|
52
|
import java.awt.Dimension;
|
52
|
53
|
import java.awt.event.WindowEvent;
|
53
|
54
|
import java.awt.event.WindowListener;
|
54
|
55
|
import java.util.Optional;
|
55
|
56
|
|
56
|
|
-import javax.inject.Provider;
|
|
57
|
+import javax.swing.BorderFactory;
|
57
|
58
|
import javax.swing.ImageIcon;
|
58
|
59
|
import javax.swing.JFrame;
|
59
|
60
|
import javax.swing.JPanel;
|
60
|
|
-import javax.swing.JSplitPane;
|
61
|
|
-import javax.swing.SwingUtilities;
|
62
|
61
|
import javax.swing.WindowConstants;
|
63
|
62
|
|
64
|
|
-import net.engio.mbassy.listener.Handler;
|
|
63
|
+import net.miginfocom.layout.PlatformDefaults;
|
65
|
64
|
import net.miginfocom.swing.MigLayout;
|
66
|
65
|
|
|
66
|
+import net.engio.mbassy.listener.Handler;
|
67
|
67
|
import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
|
68
|
68
|
import static java.util.function.Predicate.isEqual;
|
69
|
69
|
|
|
@@ -279,8 +279,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
|
279
|
279
|
|
280
|
280
|
setPreferredSize(new Dimension(800, 600));
|
281
|
281
|
|
282
|
|
- getContentPane().setLayout(new MigLayout(
|
283
|
|
- "fill, ins rel, wrap 1, hidemode 2"));
|
|
282
|
+ getContentPane().setLayout(new BorderLayout());
|
284
|
283
|
layoutComponents();
|
285
|
284
|
|
286
|
285
|
setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
|
|
@@ -330,9 +329,11 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
|
330
|
329
|
* Lays out the this component.
|
331
|
330
|
*/
|
332
|
331
|
private void layoutComponents() {
|
333
|
|
- getContentPane().add(mainSplitPane, "grow, push");
|
334
|
|
- getContentPane().add(statusBar, "wmax 100%-2*rel, "
|
335
|
|
- + "wmin 100%-2*rel, south, gap rel rel 0 rel");
|
|
332
|
+ int gap = (int) PlatformDefaults.getPanelInsets(0).getValue();
|
|
333
|
+ mainSplitPane.setBorder(BorderFactory.createEmptyBorder(gap, gap, gap, gap));
|
|
334
|
+ statusBar.setBorder(BorderFactory.createEmptyBorder(0, gap, gap, gap));
|
|
335
|
+ getContentPane().add(mainSplitPane, BorderLayout.CENTER);
|
|
336
|
+ getContentPane().add(statusBar, BorderLayout.PAGE_END);
|
336
|
337
|
}
|
337
|
338
|
|
338
|
339
|
/**
|