From dcda2c5fa15e63daad67f5720a2f726e34f8cd71 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Thu, 20 Dec 2018 20:11:57 -0500
Subject: [PATCH] Fix out of memory crash with TimeUnit.
---
ObjEditor.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ObjEditor.java b/ObjEditor.java
index f7c8293..751955c 100644
--- a/ObjEditor.java
+++ b/ObjEditor.java
@@ -1189,6 +1189,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);
@@ -2996,7 +3003,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 +3013,7 @@
}
else
{
- centralPanel.remove(timelinePanel);
+ centralPanel.remove(cameraPanel);
centralPanel.add(cameraView);
frame.setJMenuBar(null);
if (!wasFullScreen)
@@ -4533,6 +4541,7 @@
JPanel bigThree;
JTabbedPane scenePanel;
JPanel centralPanel;
+ JSplitPane cameraPanel;
JPanel timelinePanel;
JMenuBar timelineMenubar;
JSplitPane framePanel;
--
Gitblit v1.6.2