Fix drawSelf

Normand Briere

2019-04-22 ec1ab4278b2408d3b19083e530e0376f809cca44

 ObjEditor.java
..
..
@@ -31,6 +31,9 @@
31
31
         boolean timeline;
32
32
         boolean wasFullScreen;
33
33
 
34
+    GroupEditor callee;
35
+    JFrame frame;
36
+    
34
37
     // SCRIPT
35
38
     
36
39
     transient JFrame textpanel = null;
..
..
@@ -127,8 +130,7 @@
127
130
 
128
131
     static GridBagConstraints aConstraints;
129
132
     static GridBagConstraints aWindowConstraints;
130
-    GroupEditor callee;
131
-    JFrame frame;
133
+
132
134
     static int GRIDWIDTH = 100; // 4;
133
135
 
134
136
     public void closeUI()
..
..
@@ -309,7 +311,7 @@
309
311
         toggleTextureItem.setState(CameraPane.textureon);
310
312
         cameraMenu.add(toggleLiveItem = new CheckboxMenuItem("Live"));
311
313
         toggleLiveItem.addItemListener(this);
312
-        toggleLiveItem.setState(CameraPane.isLIVE());
314
+        toggleLiveItem.setState(Globals.isLIVE());
313
315
         cameraMenu.add(stepItem = new MenuItem("Step"));
314
316
         stepItem.addActionListener(this);
315
317
 //		cameraMenu.add(toggleDLItem = new CheckboxMenuItem("Display List"));
..
..
@@ -1189,6 +1191,13 @@
1189
1191
 	timelinePanel = new JPanel(new BorderLayout());
1190
1192
         timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1191
1193
 
1194
+        cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1195
+        cameraPanel.setContinuousLayout(true);
1196
+        cameraPanel.setOneTouchExpandable(true);
1197
+//        cameraPanel.setDividerLocation(0.9);
1198
+//        cameraPanel.setDividerSize(9);
1199
+        cameraPanel.setResizeWeight(1.0);
1200
+        
1192
1201
         centralPanel.add(cameraView);
1193
1202
         //frame.setJMenuBar(timelineMenubar);
1194
1203
         //centralPanel.add(timelinePanel);
..
..
@@ -1362,7 +1371,8 @@
1362
1371
         //worldPane.add(bigPanel);
1363
1372
         //worldPane.add(worldPanel);
1364
1373
                 /**/
1365
-        frame.getContentPane().add(/*"Center",*/framePanel);
1374
+        //frame.getContentPane().add(/*"Center",*/framePanel);
1375
+        frame.add(/*"Center",*/framePanel);
1366
1376
         //frame.getContentPane().add(/*"Center",*/ worldPane);
1367
1377
 
1368
1378
 //            aConstraints = gbc; // (GridBagConstraints) GrafreeD.clone(gbc);
..
..
@@ -2996,7 +3006,8 @@
2996
3006
             if (timeline)
2997
3007
             {
2998
3008
                 centralPanel.remove(cameraView);
2999
-                centralPanel.add(timelinePanel);
3009
+                cameraPanel.add(cameraView);
3010
+                centralPanel.add(cameraPanel);
3000
3011
                 frame.setJMenuBar(timelineMenubar);
3001
3012
                 wasFullScreen = CameraPane.FULLSCREEN;
3002
3013
                 if (!CameraPane.FULLSCREEN)
..
..
@@ -3005,7 +3016,7 @@
3005
3016
             }
3006
3017
             else
3007
3018
             {
3008
-                centralPanel.remove(timelinePanel);
3019
+                centralPanel.remove(cameraPanel);
3009
3020
                 centralPanel.add(cameraView);
3010
3021
                 frame.setJMenuBar(null);
3011
3022
                 if (!wasFullScreen)
..
..
@@ -3128,7 +3139,8 @@
3128
3139
             objEditor.refreshContents();
3129
3140
         } else if (event.getSource() == stepItem)
3130
3141
         {
3131
-            cameraView.ONESTEP = true;
3142
+            //cameraView.ONESTEP = true;
3143
+            Globals.ONESTEP = true;
3132
3144
             cameraView.repaint();
3133
3145
             return;
3134
3146
         } else if (event.getSource() == stepButton)
..
..
@@ -4533,6 +4545,7 @@
4533
4545
     JPanel bigThree;
4534
4546
     JTabbedPane scenePanel;
4535
4547
     JPanel centralPanel;
4548
+    JSplitPane cameraPanel;
4536
4549
     JPanel timelinePanel;
4537
4550
     JMenuBar timelineMenubar;
4538
4551
     JSplitPane framePanel;