From 611518a0ff65fd05e517d44adbcec639570b86eb Mon Sep 17 00:00:00 2001 From: Normand Briere <nbriere@noware.ca> Date: Thu, 21 Feb 2019 23:44:07 -0500 Subject: [PATCH] Yellow theme. --- ObjEditor.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ObjEditor.java b/ObjEditor.java index f7c8293..25a20ef 100644 --- a/ObjEditor.java +++ b/ObjEditor.java @@ -31,6 +31,9 @@ boolean timeline; boolean wasFullScreen; + GroupEditor callee; + JFrame frame; + // SCRIPT transient JFrame textpanel = null; @@ -127,8 +130,7 @@ static GridBagConstraints aConstraints; static GridBagConstraints aWindowConstraints; - GroupEditor callee; - JFrame frame; + static int GRIDWIDTH = 100; // 4; public void closeUI() @@ -1189,6 +1191,13 @@ timelinePanel = new JPanel(new BorderLayout()); timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel); + cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel); + cameraPanel.setContinuousLayout(true); + cameraPanel.setOneTouchExpandable(true); +// cameraPanel.setDividerLocation(0.9); +// cameraPanel.setDividerSize(9); + cameraPanel.setResizeWeight(1.0); + centralPanel.add(cameraView); //frame.setJMenuBar(timelineMenubar); //centralPanel.add(timelinePanel); @@ -1362,7 +1371,8 @@ //worldPane.add(bigPanel); //worldPane.add(worldPanel); /**/ - frame.getContentPane().add(/*"Center",*/framePanel); + //frame.getContentPane().add(/*"Center",*/framePanel); + frame.add(/*"Center",*/framePanel); //frame.getContentPane().add(/*"Center",*/ worldPane); // aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc); @@ -2996,7 +3006,8 @@ if (timeline) { centralPanel.remove(cameraView); - centralPanel.add(timelinePanel); + cameraPanel.add(cameraView); + centralPanel.add(cameraPanel); frame.setJMenuBar(timelineMenubar); wasFullScreen = CameraPane.FULLSCREEN; if (!CameraPane.FULLSCREEN) @@ -3005,7 +3016,7 @@ } else { - centralPanel.remove(timelinePanel); + centralPanel.remove(cameraPanel); centralPanel.add(cameraView); frame.setJMenuBar(null); if (!wasFullScreen) @@ -4533,6 +4544,7 @@ JPanel bigThree; JTabbedPane scenePanel; JPanel centralPanel; + JSplitPane cameraPanel; JPanel timelinePanel; JMenuBar timelineMenubar; JSplitPane framePanel; -- Gitblit v1.6.2