Browse Source

Fix layout issue from MigLayout update

The mainframe just laid out really badly, splitpane didn't grow, the
statusbar was underneath things.
pull/482/head
Greg Holmes 7 years ago
parent
commit
15dc5f8d0a
1 changed files with 10 additions and 9 deletions
  1. 10
    9
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java

+ 10
- 9
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java View File

47
 import com.dmdirc.ui.CoreUIUtils;
47
 import com.dmdirc.ui.CoreUIUtils;
48
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
48
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
49
 
49
 
50
+import java.awt.BorderLayout;
50
 import java.awt.Dialog;
51
 import java.awt.Dialog;
51
 import java.awt.Dimension;
52
 import java.awt.Dimension;
52
 import java.awt.event.WindowEvent;
53
 import java.awt.event.WindowEvent;
53
 import java.awt.event.WindowListener;
54
 import java.awt.event.WindowListener;
54
 import java.util.Optional;
55
 import java.util.Optional;
55
 
56
 
56
-import javax.inject.Provider;
57
+import javax.swing.BorderFactory;
57
 import javax.swing.ImageIcon;
58
 import javax.swing.ImageIcon;
58
 import javax.swing.JFrame;
59
 import javax.swing.JFrame;
59
 import javax.swing.JPanel;
60
 import javax.swing.JPanel;
60
-import javax.swing.JSplitPane;
61
-import javax.swing.SwingUtilities;
62
 import javax.swing.WindowConstants;
61
 import javax.swing.WindowConstants;
63
 
62
 
64
-import net.engio.mbassy.listener.Handler;
63
+import net.miginfocom.layout.PlatformDefaults;
65
 import net.miginfocom.swing.MigLayout;
64
 import net.miginfocom.swing.MigLayout;
66
 
65
 
66
+import net.engio.mbassy.listener.Handler;
67
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
67
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
68
 import static java.util.function.Predicate.isEqual;
68
 import static java.util.function.Predicate.isEqual;
69
 
69
 
279
 
279
 
280
         setPreferredSize(new Dimension(800, 600));
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
         layoutComponents();
283
         layoutComponents();
285
 
284
 
286
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
285
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
330
      * Lays out the this component.
329
      * Lays out the this component.
331
      */
330
      */
332
     private void layoutComponents() {
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
     /**

Loading…
Cancel
Save