GroupEditor.java | ●●●●● patch | view | raw | blame | history | |
ObjEditor.java | ●●●●● patch | view | raw | blame | history |
GroupEditor.java
.. .. @@ -2720,7 +2720,7 @@ 2720 2720 // centralPanel.setVisible(true); 2721 2721 // XYZPanel.setVisible(false); 2722 2722 bigThree.ClearUI(); 2723 - bigThree.addComponent(centralPanel);2723 + bigThree.add(centralPanel);2724 2724 bigThree.FlushUI(); 2725 2725 } else 2726 2726 if (source == threeButton) .. .. @@ -2755,8 +2755,8 @@ 2755 2755 // centralPanel.setVisible(true); 2756 2756 // XYZPanel.setVisible(true); 2757 2757 bigThree.ClearUI(); 2758 - bigThree.addComponent(centralPanel);2759 - bigThree.addComponent(XYZPanel);2758 + bigThree.add(centralPanel);2759 + bigThree.add(XYZPanel);2760 2760 bigThree.FlushUI(); 2761 2761 } else 2762 2762 if (source == fourButton) .. .. @@ -2791,7 +2791,7 @@ 2791 2791 // centralPanel.setVisible(false); 2792 2792 // XYZPanel.setVisible(false); 2793 2793 bigThree.ClearUI(); 2794 - bigThree.addComponent(scenePanel);2794 + bigThree.add(scenePanel);2795 2795 bigThree.FlushUI(); 2796 2796 } else 2797 2797 if (source == sixButton) .. .. @@ -2826,8 +2826,8 @@ 2826 2826 // centralPanel.setVisible(true); 2827 2827 // XYZPanel.setVisible(false); 2828 2828 bigThree.ClearUI(); 2829 - bigThree.addComponent(scenePanel);2830 - bigThree.addComponent(centralPanel);2829 + bigThree.add(scenePanel);2830 + bigThree.add(centralPanel);2831 2831 bigThree.FlushUI(); 2832 2832 } else 2833 2833 if (source == sevenButton) .. .. @@ -2862,9 +2862,9 @@ 2862 2862 // centralPanel.setVisible(true); 2863 2863 // XYZPanel.setVisible(true); 2864 2864 bigThree.ClearUI(); 2865 - bigThree.addComponent(scenePanel);2866 - bigThree.addComponent(centralPanel);2867 - bigThree.addComponent(XYZPanel);2865 + bigThree.add(scenePanel);2866 + bigThree.add(centralPanel);2867 + bigThree.add(XYZPanel);2868 2868 bigThree.FlushUI(); 2869 2869 } else 2870 2870 if (source == rootButton) ObjEditor.java
.. .. @@ -1189,7 +1189,8 @@ 1189 1189 //JPanel worldPanel = 1190 1190 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true); 1191 1191 //worldPanel.setName("World"); 1192 - centralPanel = new JPanel(new BorderLayout());1192 + centralPanel = new cGridBag();1193 + centralPanel.preferredWidth = 20;1193 1194 timelinePanel = new JPanel(new BorderLayout()); 1194 1195 timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel); 1195 1196 .. .. @@ -1222,6 +1223,7 @@ 1222 1223 XYZPanel = new cGridBag().setVertical(true); 1223 1224 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5)); 1224 1225 1226 + XYZPanel.preferredWidth = 5;1225 1227 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll); 1226 1228 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll); 1227 1229 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll); .. .. @@ -1286,10 +1288,13 @@ 1286 1288 scrollpane.setWheelScrollingEnabled(true); 1287 1289 scrollpane.addMouseWheelListener(this); // Default not fast enough 1288 1290 1289 - /*JTabbedPane*/ scenePanel = new JTabbedPane();1290 - scenePanel.add(scrollpane);1291 + /*JTabbedPane*/ scenePanel = new cGridBag();1292 + scenePanel.preferredWidth = 7;1293 +1294 + JTabbedPane tabbedPane = new JTabbedPane();1295 + tabbedPane.add(scrollpane);1291 1296 1292 - scenePanel.add(FSPane = new cFileSystemPane(this));1297 + tabbedPane.add(FSPane = new cFileSystemPane(this));1293 1298 1294 1299 optionsPanel = new JPanel(new GridBagLayout()); 1295 1300 .. .. @@ -1297,8 +1302,9 @@ 1297 1302 1298 1303 AddOptions(optionsPanel, aConstraints); 1299 1304 1300 - scenePanel.add(optionsPanel);1301 -1305 + tabbedPane.add(optionsPanel);1306 +1307 + scenePanel.add(tabbedPane);1302 1308 1303 1309 /* 1304 1310 cTree jTree = new cTree(null); .. .. @@ -4559,8 +4565,8 @@ 4559 4565 JSplitPane gridPanel; 4560 4566 JSplitPane bigPanel; 4561 4567 cGridBag bigThree; 4562 - JTabbedPane scenePanel;4563 - JPanel centralPanel;4568 + cGridBag scenePanel;4569 + cGridBag centralPanel;4564 4570 JSplitPane cameraPanel; 4565 4571 JPanel timelinePanel; 4566 4572 JMenuBar timelineMenubar;