Просмотр исходного кода

Merge pull request #482 from greboid/master

Fix layout issue from MigLayout update
pull/483/head
Chris Smith 8 лет назад
Родитель
Сommit
a2ebaf70fd
1 измененных файлов: 12 добавлений и 6 удалений
  1. 12
    6
      ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java

+ 12
- 6
ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java Просмотреть файл

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;
54
 import java.util.Optional;
55
 import java.util.Optional;
55
 
56
 
56
 import javax.inject.Provider;
57
 import javax.inject.Provider;
58
+
59
+import javax.swing.BorderFactory;
57
 import javax.swing.ImageIcon;
60
 import javax.swing.ImageIcon;
58
 import javax.swing.JFrame;
61
 import javax.swing.JFrame;
59
 import javax.swing.JPanel;
62
 import javax.swing.JPanel;
61
 import javax.swing.SwingUtilities;
64
 import javax.swing.SwingUtilities;
62
 import javax.swing.WindowConstants;
65
 import javax.swing.WindowConstants;
63
 
66
 
64
-import net.engio.mbassy.listener.Handler;
67
+import net.miginfocom.layout.PlatformDefaults;
65
 import net.miginfocom.swing.MigLayout;
68
 import net.miginfocom.swing.MigLayout;
66
 
69
 
70
+import net.engio.mbassy.listener.Handler;
71
+
67
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
72
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
68
 import static java.util.function.Predicate.isEqual;
73
 import static java.util.function.Predicate.isEqual;
69
 
74
 
279
 
284
 
280
         setPreferredSize(new Dimension(800, 600));
285
         setPreferredSize(new Dimension(800, 600));
281
 
286
 
282
-        getContentPane().setLayout(new MigLayout(
283
-                "fill, ins rel, wrap 1, hidemode 2"));
287
+        getContentPane().setLayout(new BorderLayout());
284
         layoutComponents();
288
         layoutComponents();
285
 
289
 
286
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
290
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
330
      * Lays out the this component.
334
      * Lays out the this component.
331
      */
335
      */
332
     private void layoutComponents() {
336
     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");
337
+        int gap = (int) PlatformDefaults.getPanelInsets(0).getValue();
338
+        mainSplitPane.setBorder(BorderFactory.createEmptyBorder(gap, gap, gap, gap));
339
+        statusBar.setBorder(BorderFactory.createEmptyBorder(0, gap, gap, gap));
340
+        getContentPane().add(mainSplitPane, BorderLayout.CENTER);
341
+        getContentPane().add(statusBar, BorderLayout.PAGE_END);
336
     }
342
     }
337
 
343
 
338
     /**
344
     /**

Загрузка…
Отмена
Сохранить