From 40d3eef2f64b4a9ec579959c26c75f8e077d001f Mon Sep 17 00:00:00 2001
From: Honfika <honfika@gmail.com>
Date: Fri, 27 Dec 2013 16:12:18 +0100
Subject: [PATCH] flashpanel and fontpanel fix

---
 .../jpexs/decompiler/flash/gui/FontPanel.java | 19 ++++++++-----------
 .../decompiler/flash/gui/MainFramePanel.java  |  1 +
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
index cec012725..be4d67d24 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/FontPanel.java
@@ -74,9 +74,8 @@ public class FontPanel extends JPanel implements ActionListener {
         createFontPanel();
     }
     
-    private JPanel createFontPanel() {
+    private void createFontPanel() {
         //TODO: This layout SUCKS! If you know something better, please fix it!
-        final JPanel fontPanel = new JPanel();
         final JPanel fontParams2 = new JPanel();
         fontParams2.setLayout(null);
         final Component[][] ctable = new Component[][]{
@@ -118,20 +117,20 @@ public class FontPanel extends JPanel implements ActionListener {
             @Override
             public void componentResized(ComponentEvent e) {
                 int h = 0;
-                Insets is = fontPanel.getInsets();
+                Insets is = getInsets();
                 Insets is2 = fontParams2.getInsets();
                 for (int i = 0; i < ctable.length; i++) {
                     Dimension d = ctable[i][0].getPreferredSize();
                     Dimension d2 = ctable[i][1].getPreferredSize();
                     ctable[i][0].setBounds(borderLeft, h, maxws[0], d2.height);
 
-                    int w2 = fontPanel.getWidth() - 3 * borderLeft - maxws[0] - is.left - is.right - 10;
+                    int w2 = getWidth() - 3 * borderLeft - maxws[0] - is.left - is.right - 10;
                     ctable[i][1].setBounds(borderLeft + maxws[0] + borderLeft, h, w2, d2.height);
                     h += Math.max(d.height, d2.height);
                 }
 
-                fontParams2.setPreferredSize(new Dimension(fontPanel.getWidth() - 20, h));
-                fontPanel.revalidate();
+                fontParams2.setPreferredSize(new Dimension(getWidth() - 20, h));
+                revalidate();
             }
 
             @Override
@@ -150,7 +149,7 @@ public class FontPanel extends JPanel implements ActionListener {
             }
         };
         final JPanel fontParams1 = new JPanel();
-        fontPanel.addComponentListener(fontChangeList);
+        addComponentListener(fontChangeList);
 
         fontChangeList.componentResized(null);
         fontParams1.setLayout(new BoxLayout(fontParams1, BoxLayout.Y_AXIS));
@@ -195,11 +194,9 @@ public class FontPanel extends JPanel implements ActionListener {
         fontCharPanel.add(fontSelectionPanel);
         fontParams1.add(fontCharPanel);
         fontParams1.add(fontEmbedButton);
-        fontPanel.setLayout(new BorderLayout());
+        setLayout(new BorderLayout());
         fontParams1.add(Box.createVerticalGlue());
-        fontPanel.add(new JScrollPane(fontParams1), BorderLayout.CENTER);
-        
-        return fontPanel;
+        add(new JScrollPane(fontParams1), BorderLayout.CENTER);
     }
     
     public String getSelectedFont() {
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainFramePanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainFramePanel.java
index 56be32516..c941e85a3 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainFramePanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainFramePanel.java
@@ -454,6 +454,7 @@ public final class MainFramePanel extends JPanel implements ActionListener, Tree
 
         this.mainFrame = mainFrame;
         this.mainMenu = mainMenu;
+        this.flashPanel = flashPanel;
         
         mainFrame.setTitle(ApplicationInfo.applicationVerName);