From c0c300a9dbd4c0fc127e003e9481d3f9246bbe7a Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Sun, 28 Apr 2019 21:47:06 -0400
Subject: [PATCH] Big three proportional
---
ObjEditor.java | 22 ++++++++++++++--------
GroupEditor.java | 18 +++++++++---------
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/GroupEditor.java b/GroupEditor.java
index a2fec77..22fce0e 100644
--- a/GroupEditor.java
+++ b/GroupEditor.java
@@ -2720,7 +2720,7 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(centralPanel);
+ bigThree.add(centralPanel);
bigThree.FlushUI();
} else
if (source == threeButton)
@@ -2755,8 +2755,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(true);
bigThree.ClearUI();
- bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ bigThree.add(centralPanel);
+ bigThree.add(XYZPanel);
bigThree.FlushUI();
} else
if (source == fourButton)
@@ -2791,7 +2791,7 @@
// centralPanel.setVisible(false);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
+ bigThree.add(scenePanel);
bigThree.FlushUI();
} else
if (source == sixButton)
@@ -2826,8 +2826,8 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(false);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
- bigThree.addComponent(centralPanel);
+ bigThree.add(scenePanel);
+ bigThree.add(centralPanel);
bigThree.FlushUI();
} else
if (source == sevenButton)
@@ -2862,9 +2862,9 @@
// centralPanel.setVisible(true);
// XYZPanel.setVisible(true);
bigThree.ClearUI();
- bigThree.addComponent(scenePanel);
- bigThree.addComponent(centralPanel);
- bigThree.addComponent(XYZPanel);
+ bigThree.add(scenePanel);
+ bigThree.add(centralPanel);
+ bigThree.add(XYZPanel);
bigThree.FlushUI();
} else
if (source == rootButton)
diff --git a/ObjEditor.java b/ObjEditor.java
index 0ea0e59..877e81e 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1189,7 +1189,8 @@
//JPanel worldPanel =
// new gov.nasa.worldwind.examples.ApplicationTemplate.AppPanel(null, true);
//worldPanel.setName("World");
- centralPanel = new JPanel(new BorderLayout());
+ centralPanel = new cGridBag();
+ centralPanel.preferredWidth = 20;
timelinePanel = new JPanel(new BorderLayout());
timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
@@ -1222,6 +1223,7 @@
XYZPanel = new cGridBag().setVertical(true);
//XYZPanel.setLayout(new GridLayout(3, 1, 5, 5));
+ XYZPanel.preferredWidth = 5;
XYZPanel.addComponent(/*BorderLayout.SOUTH,*/sideView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.CENTER,*/frontView); // Scroll);
XYZPanel.addComponent(/*BorderLayout.NORTH,*/topView); // Scroll);
@@ -1286,10 +1288,13 @@
scrollpane.setWheelScrollingEnabled(true);
scrollpane.addMouseWheelListener(this); // Default not fast enough
- /*JTabbedPane*/ scenePanel = new JTabbedPane();
- scenePanel.add(scrollpane);
+ /*JTabbedPane*/ scenePanel = new cGridBag();
+ scenePanel.preferredWidth = 7;
+
+ JTabbedPane tabbedPane = new JTabbedPane();
+ tabbedPane.add(scrollpane);
- scenePanel.add(FSPane = new cFileSystemPane(this));
+ tabbedPane.add(FSPane = new cFileSystemPane(this));
optionsPanel = new JPanel(new GridBagLayout());
@@ -1297,8 +1302,9 @@
AddOptions(optionsPanel, aConstraints);
- scenePanel.add(optionsPanel);
-
+ tabbedPane.add(optionsPanel);
+
+ scenePanel.add(tabbedPane);
/*
cTree jTree = new cTree(null);
@@ -4559,8 +4565,8 @@
JSplitPane gridPanel;
JSplitPane bigPanel;
cGridBag bigThree;
- JTabbedPane scenePanel;
- JPanel centralPanel;
+ cGridBag scenePanel;
+ cGridBag centralPanel;
JSplitPane cameraPanel;
JPanel timelinePanel;
JMenuBar timelineMenubar;
--
Gitblit v1.6.2