Browse Source

Fixes issue 2271

tags/0.6.3m1rc1
Gregory Holmes 15 years ago
parent
commit
562f1b43e3

+ 1
- 2
src/com/dmdirc/addons/ui_swing/wizard/WizardDialog.java View File

67
 
67
 
68
         setTitle(title);
68
         setTitle(title);
69
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
69
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
70
-        setLayout(new MigLayout("ins 0, fill, pack, wmin 400, wmax 400"));
71
         orderButtons(new JButton(), new JButton());
70
         orderButtons(new JButton(), new JButton());
72
         this.wizard = new WizardPanel(title, steps, wizard);
71
         this.wizard = new WizardPanel(title, steps, wizard);
73
         this.parentWindow = parentWindow;
72
         this.parentWindow = parentWindow;
76
 
75
 
77
     /** Lays out the components. */
76
     /** Lays out the components. */
78
     private void layoutComponents() {
77
     private void layoutComponents() {
79
-        add(wizard, "grow");
78
+        add(wizard);
80
     }
79
     }
81
 
80
 
82
     /** Displays the wizard. */
81
     /** Displays the wizard. */

+ 2
- 2
src/com/dmdirc/addons/ui_swing/wizard/WizardFrame.java View File

24
 
24
 
25
 
25
 
26
 import com.dmdirc.ui.CoreUIUtils;
26
 import com.dmdirc.ui.CoreUIUtils;
27
+
27
 import java.util.List;
28
 import java.util.List;
28
 
29
 
29
 import javax.swing.JFrame;
30
 import javax.swing.JFrame;
57
 
58
 
58
         setTitle(title);
59
         setTitle(title);
59
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
60
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);
60
-        setLayout(new MigLayout("ins 0, fill, pack, wmin 400, wmax 400"));
61
         this.wizard = new WizardPanel(title, steps, wizard);
61
         this.wizard = new WizardPanel(title, steps, wizard);
62
         layoutComponents();
62
         layoutComponents();
63
     }
63
     }
64
 
64
 
65
     /** Lays out the components. */
65
     /** Lays out the components. */
66
     private void layoutComponents() {
66
     private void layoutComponents() {
67
-        add(wizard, "grow");
67
+        add(wizard);
68
     }
68
     }
69
 
69
 
70
     /** Displays the wizard. */
70
     /** Displays the wizard. */

+ 5
- 5
src/com/dmdirc/addons/ui_swing/wizard/WizardPanel.java View File

117
     /** Lays out the components. */
117
     /** Lays out the components. */
118
     private void layoutComponents() {
118
     private void layoutComponents() {
119
         final JPanel progressPanel = new JPanel(new MigLayout("fill"));
119
         final JPanel progressPanel = new JPanel(new MigLayout("fill"));
120
-        progressPanel.add(progressLabel, "growx");
120
+        progressPanel.add(progressLabel, "growx, pushx");
121
         progressPanel.add(prev, "sg button");
121
         progressPanel.add(prev, "sg button");
122
         progressPanel.add(next, "sg button");
122
         progressPanel.add(next, "sg button");
123
         progressPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
123
         progressPanel.setBorder(BorderFactory.createMatteBorder(1, 0, 0, 0,
125
         progressPanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED,
125
         progressPanel.setBorder(new EtchedLineBorder(EtchedBorder.LOWERED,
126
                 BorderSide.TOP));
126
                 BorderSide.TOP));
127
 
127
 
128
-        setLayout(new MigLayout("fill, wrap 1, ins 0"));
129
-        add(titleLabel, "growx");
130
-        add(stepsPanel, "grow");
131
-        add(progressPanel, "growx");
128
+        setLayout(new MigLayout("fill, wrap 1, ins 0, w 400!, pack"));
129
+        add(titleLabel, "growx, pushx");
130
+        add(stepsPanel, "grow, pushx");
131
+        add(progressPanel, "growx, pushx");
132
     }
132
     }
133
 
133
 
134
     /** Displays the wizard. */
134
     /** Displays the wizard. */

Loading…
Cancel
Save