Normand Briere
2019-04-29 c0c300a9dbd4c0fc127e003e9481d3f9246bbe7a
Big three proportional
2 files modified
40 ■■■■■ changed files
GroupEditor.java 18 ●●●● patch | view | raw | blame | history
ObjEditor.java 22 ●●●●● patch | view | raw | blame | history
GroupEditor.java
....@@ -2720,7 +2720,7 @@
27202720 // centralPanel.setVisible(true);
27212721 // XYZPanel.setVisible(false);
27222722 bigThree.ClearUI();
2723
- bigThree.addComponent(centralPanel);
2723
+ bigThree.add(centralPanel);
27242724 bigThree.FlushUI();
27252725 } else
27262726 if (source == threeButton)
....@@ -2755,8 +2755,8 @@
27552755 // centralPanel.setVisible(true);
27562756 // XYZPanel.setVisible(true);
27572757 bigThree.ClearUI();
2758
- bigThree.addComponent(centralPanel);
2759
- bigThree.addComponent(XYZPanel);
2758
+ bigThree.add(centralPanel);
2759
+ bigThree.add(XYZPanel);
27602760 bigThree.FlushUI();
27612761 } else
27622762 if (source == fourButton)
....@@ -2791,7 +2791,7 @@
27912791 // centralPanel.setVisible(false);
27922792 // XYZPanel.setVisible(false);
27932793 bigThree.ClearUI();
2794
- bigThree.addComponent(scenePanel);
2794
+ bigThree.add(scenePanel);
27952795 bigThree.FlushUI();
27962796 } else
27972797 if (source == sixButton)
....@@ -2826,8 +2826,8 @@
28262826 // centralPanel.setVisible(true);
28272827 // XYZPanel.setVisible(false);
28282828 bigThree.ClearUI();
2829
- bigThree.addComponent(scenePanel);
2830
- bigThree.addComponent(centralPanel);
2829
+ bigThree.add(scenePanel);
2830
+ bigThree.add(centralPanel);
28312831 bigThree.FlushUI();
28322832 } else
28332833 if (source == sevenButton)
....@@ -2862,9 +2862,9 @@
28622862 // centralPanel.setVisible(true);
28632863 // XYZPanel.setVisible(true);
28642864 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);
28682868 bigThree.FlushUI();
28692869 } else
28702870 if (source == rootButton)
ObjEditor.java
....@@ -1189,7 +1189,8 @@
11891189 //JPanel worldPanel =
11901190 // new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
11911191 //worldPanel.setName("World");
1192
- centralPanel = new JPanel(new BorderLayout());
1192
+ centralPanel = new cGridBag();
1193
+ centralPanel.preferredWidth = 20;
11931194 timelinePanel = new JPanel(new BorderLayout());
11941195 timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
11951196
....@@ -1222,6 +1223,7 @@
12221223 XYZPanel = new cGridBag().setVertical(true);
12231224 //XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
12241225
1226
+ XYZPanel.preferredWidth = 5;
12251227 XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
12261228 XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
12271229 XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
....@@ -1286,10 +1288,13 @@
12861288 scrollpane.setWheelScrollingEnabled(true);
12871289 scrollpane.addMouseWheelListener(this); // Default not fast enough
12881290
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);
12911296
1292
- scenePanel.add(FSPane = new cFileSystemPane(this));
1297
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
12931298
12941299 optionsPanel = new JPanel(new GridBagLayout());
12951300
....@@ -1297,8 +1302,9 @@
12971302
12981303 AddOptions(optionsPanel, aConstraints);
12991304
1300
- scenePanel.add(optionsPanel);
1301
-
1305
+ tabbedPane.add(optionsPanel);
1306
+
1307
+ scenePanel.add(tabbedPane);
13021308
13031309 /*
13041310 cTree jTree = new cTree(null);
....@@ -4559,8 +4565,8 @@
45594565 JSplitPane gridPanel;
45604566 JSplitPane bigPanel;
45614567 cGridBag bigThree;
4562
- JTabbedPane scenePanel;
4563
- JPanel centralPanel;
4568
+ cGridBag scenePanel;
4569
+ cGridBag centralPanel;
45644570 JSplitPane cameraPanel;
45654571 JPanel timelinePanel;
45664572 JMenuBar timelineMenubar;