diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java b/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java index ef7c91f33..7ff1c1a74 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/ListLayout.java @@ -50,12 +50,13 @@ public class ListLayout implements LayoutManager { public Dimension preferredLayoutSize(Container parent) { int h = 0; int maxw = 0; + Insets ins = parent.getInsets(); boolean first = true; for (Component c : parent.getComponents()) { if (!c.isVisible()) { continue; } - if (!first) { + if (true) { //!first) { h += border; } Dimension pref = c.getPreferredSize(); @@ -65,7 +66,8 @@ public class ListLayout implements LayoutManager { h += pref.height; first = false; } - Insets ins = parent.getInsets(); + + maxw = parent.getSize().width - ins.left - ins.right; return new Dimension(maxw, h); } @@ -79,6 +81,7 @@ public class ListLayout implements LayoutManager { Dimension dim = preferredLayoutSize(parent); int top = 0; Insets ins = parent.getInsets(); + top = ins.top; boolean first = true; for (Component c : parent.getComponents()) { if (!c.isVisible()) { diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java index 1bf02c1e4..e0079df4b 100644 --- a/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java +++ b/trunk/src/com/jpexs/decompiler/flash/gui/LoadingDialog.java @@ -17,10 +17,13 @@ package com.jpexs.decompiler.flash.gui; import java.awt.BorderLayout; +import java.awt.Container; import java.awt.Dimension; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.awt.image.ImageObserver; +import javax.swing.BorderFactory; +import javax.swing.BoxLayout; import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JProgressBar; @@ -59,24 +62,27 @@ public class LoadingDialog extends AppDialog implements ImageObserver { public LoadingDialog() { setResizable(false); setTitle(Main.shortApplicationVerName); - setSize(275, 150); - setLayout(new BorderLayout()); + setSize(Math.max(270, 150 + getFontMetrics(new JLabel().getFont()).stringWidth(translate("loadingpleasewait"))), 150); + Container cnt = getContentPane(); + cnt.setLayout(new BorderLayout()); loadingPanel = new LoadingPanel(50, 50); loadingPanel.setPreferredSize(new Dimension(100, 100)); add(loadingPanel, BorderLayout.WEST); JPanel pan = new JPanel(); - pan.setLayout(null); - pan.setPreferredSize(new Dimension(120, 150)); + pan.setLayout(new ListLayout(5)); + //pan.setPreferredSize(new Dimension(120, 150)); JLabel loadingLabel = new JLabel(translate("loadingpleasewait")); - loadingLabel.setBounds(0, 30, 150, 20); + //loadingLabel.setBounds(0, 30, 150, 20); loadingLabel.setHorizontalAlignment(SwingConstants.CENTER); - detailLabel.setBounds(0, 45, 150, 20); - progressBar.setBounds(0, 70, 125, 25); + detailLabel.setHorizontalAlignment(SwingConstants.CENTER); + //detailLabel.setBounds(0, 45, 150, 20); + //progressBar.setBounds(0, 70, 125, 25); pan.add(loadingLabel); pan.add(detailLabel); pan.add(progressBar); - add(pan, BorderLayout.CENTER); + pan.setBorder(BorderFactory.createEmptyBorder(20, 10, 10, 10)); + cnt.add(pan, BorderLayout.CENTER); progressBar.setVisible(false); progressBar.setStringPainted(true); //progressBar.setVisible(false);