Full-screen mode.

Normand Briere

2019-06-23 8088590686a45e71278f9a52bb9cc37943dc0c37

 ObjEditor.java
..
..
@@ -36,6 +36,8 @@
36
36
     GroupEditor callee;
37
37
     JFrame frame;
38
38
     
39
+    static ObjEditor theFrame;
40
+    
39
41
     // SCRIPT
40
42
     
41
43
     transient JFrame textpanel = null;
..
..
@@ -244,6 +246,7 @@
244
246
         //localCopy.parent = null;
245
247
 
246
248
         frame = new JFrame();
249
+                frame.setUndecorated(true);
247
250
         objEditor = this;
248
251
         this.callee = callee;
249
252
 
..
..
@@ -583,19 +586,89 @@
583
586
         }
584
587
     }
585
588
 
589
+static GraphicsDevice device = GraphicsEnvironment
590
+        .getLocalGraphicsEnvironment().getScreenDevices()[0];
591
+
592
+    Rectangle keeprect;
593
+        cRadio radio;
594
+        
595
+cButton keepButton;
596
+	cButton twoButton; // Full 3D
597
+	cButton sixButton;
598
+	cButton threeButton;
599
+	cButton sevenButton;
600
+	cButton fourButton; // full panel
601
+	cButton oneButton; // full XYZ
602
+        //cButton currentLayout;
603
+        
604
+        boolean maximized;
605
+    
606
+        void Minimize()
607
+        {
608
+            frame.setState(Frame.ICONIFIED);
609
+        }
610
+        
611
+        void Maximize()
612
+        {
613
+            if (maximized)
614
+            {
615
+                frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
616
+            }
617
+            else
618
+            {
619
+                keeprect = frame.getBounds();
620
+                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
621
+                Dimension rect2 = frame.getToolkit().getScreenSize();
622
+                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
623
+//                frame.setState(Frame.MAXIMIZED_BOTH);
624
+            }
625
+            
626
+            maximized ^= true;
627
+        }
628
+        
586
629
         void ToggleFullScreen()
587
630
         {
588
631
                 if (CameraPane.FULLSCREEN)
589
632
                 {
590
-                    frame.getContentPane().remove(/*"Center",*/bigThree);
591
-                    framePanel.add(bigThree);
592
-                    frame.getContentPane().add(/*"Center",*/framePanel);
633
+                    device.setFullScreenWindow(null);
634
+                    //frame.setVisible(false);
635
+//                frame.removeNotify();
636
+//                frame.setUndecorated(false);
637
+//                frame.addNotify();
638
+                //frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
639
+                    
640
+// X                   frame.getContentPane().remove(/*"Center",*/bigThree);
641
+// X                   framePanel.add(bigThree);
642
+// X                   frame.getContentPane().add(/*"Center",*/framePanel);
643
+                    framePanel.setDividerLocation(1);
644
+                    
645
+                    //frame.setVisible(true);
646
+                    radio.layout = keepButton;
647
+                    //theFrame = null;
648
+                    keepButton = null;
649
+                    radio.layout.doClick();
650
+                    
593
651
                 } else
594
652
                 {
595
-                    frame.getContentPane().remove(/*"Center",*/framePanel);
596
-                    framePanel.remove(bigThree);
597
-                    frame.getContentPane().add(/*"Center",*/bigThree);
653
+                    keepButton = radio.layout;
654
+                    //keeprect = frame.getBounds();
655
+//                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
656
+//                        frame.getToolkit().getScreenSize().height);
657
+                    //frame.setVisible(false);
658
+                    device.setFullScreenWindow(frame);
659
+//                frame.removeNotify();
660
+//                frame.setUndecorated(true);
661
+//                frame.addNotify();
662
+// X                   frame.getContentPane().remove(/*"Center",*/framePanel);
663
+// X                   framePanel.remove(bigThree);
664
+// X                   frame.getContentPane().add(/*"Center",*/bigThree);
665
+                    framePanel.setDividerLocation(0);
666
+
667
+                    radio.layout = twoButton;
668
+                    radio.layout.doClick();
669
+                    //frame.setVisible(true);
598
670
                 }
671
+                
599
672
                 cameraView.ToggleFullScreen();
600
673
         }
601
674
 
..
..
@@ -947,7 +1020,7 @@
947
1020
         rewindCB.setToolTipText("Rewind animation");
948
1021
         
949
1022
         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
950
-        randomCB.setToolTipText("Rewind or Go back and forth randomly");
1023
+        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
951
1024
 
952
1025
         if (Globals.ADVANCED)
953
1026
         {
..
..
@@ -1184,8 +1257,11 @@
1184
1257
         //worldPanel.setName("World");
1185
1258
 	centralPanel = new cGridBag();
1186
1259
         centralPanel.preferredWidth = 20;
1187
-	timelinePanel = new JPanel(new BorderLayout());
1188
-        timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1260
+        
1261
+        if (Globals.ADVANCED)
1262
+        {
1263
+            timelinePanel = new JPanel(new BorderLayout());
1264
+            timelineMenubar = new timeflow.app.TimeflowApp().TimeFlowWindow(timelinePanel);
1189
1265
 
1190
1266
         cameraPanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, cameraView, timelinePanel);
1191
1267
         cameraPanel.setContinuousLayout(true);
..
..
@@ -1194,7 +1270,10 @@
1194
1270
 //        cameraPanel.setDividerSize(9);
1195
1271
         cameraPanel.setResizeWeight(1.0);
1196
1272
         
1273
+        }
1274
+        
1197
1275
         centralPanel.add(cameraView);
1276
+        centralPanel.setFocusable(true);
1198
1277
         //frame.setJMenuBar(timelineMenubar);
1199
1278
         //centralPanel.add(timelinePanel);
1200
1279
         
..
..
@@ -1392,6 +1471,8 @@
1392
1471
         frame.setSize(1280, 860);
1393
1472
         frame.setVisible(true);
1394
1473
 
1474
+                    cameraView.requestFocusInWindow();
1475
+                    
1395
1476
         gridPanel.setDividerLocation(1.0);
1396
1477
 
1397
1478
         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);