diff --git a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java b/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java index c91cab24a..c57c6906e 100644 --- a/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java +++ b/trunk/src/com/jpexs/asdec/abc/gui/ABCPanel.java @@ -30,6 +30,7 @@ import java.awt.event.*; import java.io.IOException; import java.util.ArrayList; import java.util.List; +import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; import javax.swing.*; @@ -159,10 +160,21 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { updateConstList(); } - public void initSplits(){ - splitPaneDecompiledVSDetail.setDividerLocation(getWidth()*1/3); - splitPaneTreeVSNavigator.setDividerLocation(getHeight()/2); - splitPaneTreeNavVSDecompiledDetail.setDividerLocation(getWidth()*1/3); + public void initSplits(){ + splitPaneTreeVSNavigator.setDividerLocation(splitPaneTreeVSNavigator.getHeight()/2); + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex); + } + splitPaneTreeNavVSDecompiledDetail.setDividerLocation(splitPaneTreeNavVSDecompiledDetail.getWidth()*1/3); + try { + Thread.sleep(100); + } catch (InterruptedException ex) { + Logger.getLogger(ABCPanel.class.getName()).log(Level.SEVERE, null, ex); + } + splitPaneDecompiledVSDetail.setDividerLocation(splitPaneDecompiledVSDetail.getWidth()*1/2); + } public ABCPanel(List list) { @@ -193,6 +205,8 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { decLabel.setBorder(new BevelBorder(BevelBorder.RAISED)); splitPaneDecompiledVSDetail = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panB, detailPanel); + splitPaneDecompiledVSDetail.setResizeWeight(0.5); + splitPaneDecompiledVSDetail.setContinuousLayout(true); decompiledTextArea.setContentType("text/actionscript"); JPanel pan2 = new JPanel(); @@ -250,10 +264,13 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { splitPaneTreeVSNavigator = new JSplitPane(JSplitPane.VERTICAL_SPLIT, treePanel, navPanel); + splitPaneTreeVSNavigator.setResizeWeight(0.5); + splitPaneTreeVSNavigator.setContinuousLayout(true); Main.startWork("Creating window..."); JTabbedPane tabbedPane = new JTabbedPane(); tabbedPane.addTab("Scripts", splitPaneTreeVSNavigator); - + //tabbedPane.setTabPlacement(JTabbedPane.BOTTOM); + pan2.add(tabbedPane, BorderLayout.CENTER); abcComboBox.addItemListener(this); @@ -261,8 +278,8 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { splitPaneTreeNavVSDecompiledDetail = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, pan2, splitPaneDecompiledVSDetail); - - + splitPaneTreeNavVSDecompiledDetail.setResizeWeight(0); + splitPaneTreeNavVSDecompiledDetail.setContinuousLayout(true); //pan2.setPreferredSize(new Dimension(300, 200)); @@ -338,8 +355,6 @@ public class ABCPanel extends JPanel implements ItemListener, ActionListener { public void display() { setVisible(true); - splitPaneTreeVSNavigator.setDividerLocation(0.5); - splitPaneDecompiledVSDetail.setDividerLocation(0.5); } @Override diff --git a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java index 982a1600c..c541f5a5b 100644 --- a/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java +++ b/trunk/src/com/jpexs/asdec/action/gui/ActionPanel.java @@ -110,7 +110,8 @@ public class ActionPanel extends JPanel implements TreeSelectionListener, Action setLayout(new BorderLayout()); add(splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(tagTree), splitPane2 = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, panA, panB)), BorderLayout.CENTER); - + splitPane.setResizeWeight(0.5); + splitPane2.setResizeWeight(0.5); editor.setContentType("text/flasm"); decompiledEditor.setContentType("text/actionscript"); tagTree.addTreeSelectionListener(this); diff --git a/trunk/src/com/jpexs/asdec/gui/MainFrame.java b/trunk/src/com/jpexs/asdec/gui/MainFrame.java index f79707586..683016bac 100644 --- a/trunk/src/com/jpexs/asdec/gui/MainFrame.java +++ b/trunk/src/com/jpexs/asdec/gui/MainFrame.java @@ -90,6 +90,8 @@ import javax.swing.border.BevelBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; import com.jpexs.flashplayer.FlashPanel; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; /** * * @author Jindra @@ -113,9 +115,9 @@ public class MainFrame extends JFrame implements ActionListener { } statusLabel.setText(s); } - + public MainFrame(SWF swf) { - setSize(1024, 768); + setSize(1000, 700); tabPane = new JTabbedPane(); View.setWindowIcon(this); addWindowListener(new WindowAdapter() { @@ -225,7 +227,6 @@ public class MainFrame extends JFrame implements ActionListener { menuBar.add(menuHelp); setJMenuBar(menuBar); - setSize(800, 600); List objs = new ArrayList(); objs.addAll(swf.tags); this.swf = swf; @@ -272,7 +273,7 @@ public class MainFrame extends JFrame implements ActionListener { } /*tabPane.addTab("Tags", new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, new JScrollPane(tagTree), new JScrollPane(fPanel)));*/ - tabPane.setTabPlacement(JTabbedPane.LEFT); + //tabPane.setTabPlacement(JTabbedPane.TOP); if (!abcList.isEmpty()) { tabPane.addTab("ActionScript3", abcPanel = new ABCPanel(abcList)); } else { @@ -299,7 +300,7 @@ public class MainFrame extends JFrame implements ActionListener { statusPanel.add(loadingPanel, BorderLayout.WEST); statusPanel.add(statusLabel, BorderLayout.CENTER); loadingPanel.setVisible(false); - add(statusPanel, BorderLayout.SOUTH); + add(statusPanel, BorderLayout.SOUTH); View.centerScreen(this); Main.stopWork();