← Back to branch summary

~ubuntu-branches/ubuntu/natty/icedtea-web/natty-proposed

« back to all changes in this revision

Viewing changes to netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java

  • Committer: Package Import Robot
  • Author(s): Steve Beattie
  • Date: 2012-08-03 15:42:11 UTC
  • mfrom: (19.1.4 natty-security)
  • Revision ID: package-import@ubuntu.com-20120803154211-97ii301zwp9thfxh
Tags: 1.2-2ubuntu0.11.04.3
https://launchpad.net/bugs/1025553
debian/patches/fix-plugin-error-on-chromium.patch: fix plugin
table initialization to check only that the subset of hooks that
it uses exists. (LP: #1025553)

Show diffs side-by-side

added added

removed removed

Lines of Context:
netx/net/sourceforge/jnlp/controlpanel/ControlPanel.java
115
115
        setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
116
116
        pack();
117
117
        setMinimumSize(getPreferredSize());
118
 
        setResizable(false);
119
118
    }
120
119
 
121
120
    private JPanel createTopPanel() {
232
231
 
233
232
        // Add panels.
234
233
        final JPanel settingsPanel = new JPanel(new CardLayout());
235
 
        for (SettingsPanel panel : panels) {
236
 
            JPanel p = panel.getPanel();
237
 
            p.setPreferredSize(new Dimension(530, 360));
 
234
 
 
235
        // Calculate largest minimum size we should use.
 
236
        int height = 0;
 
237
        int width = 0;
 
238
        for (SettingsPanel panel : panels) {
 
239
            JPanel p = panel.getPanel();
 
240
            Dimension d = p.getMinimumSize();
 
241
            if (d.height > height)
 
242
                height = d.height;
 
243
            if (d.width > width)
 
244
                width = d.width;
 
245
        }
 
246
        Dimension dim = new Dimension(width, height);
 
247
 
 
248
        for (SettingsPanel panel : panels) {
 
249
            JPanel p = panel.getPanel();
 
250
            p.setPreferredSize(dim);
238
251
            settingsPanel.add(p, panel.toString());
239
252
        }
240
253