Proto wget 3d models.

Normand Briere

2019-06-30 cfd7a643cb5a445016ddb15595158ecc59b184fd

 ObjEditor.java
..
..
@@ -309,7 +309,7 @@
309
309
         //localCopy.parent = null;
310
310
 
311
311
         frame = new JFrame();
312
-                frame.setUndecorated(true);
312
+                frame.setUndecorated(false);
313
313
         objEditor = this;
314
314
         this.callee = callee;
315
315
 
..
..
@@ -699,8 +699,8 @@
699
699
         }
700
700
     }
701
701
 
702
-static GraphicsDevice device = GraphicsEnvironment
703
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
702
+//static GraphicsDevice device = GraphicsEnvironment
703
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704
704
 
705
705
     Rectangle keeprect;
706
706
         cRadio radio;
..
..
@@ -741,10 +741,11 @@
741
741
             else
742
742
             {
743
743
                 keeprect = frame.getBounds();
744
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
-                Dimension rect2 = frame.getToolkit().getScreenSize();
746
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
744
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
746
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747
747
 //                frame.setState(Frame.MAXIMIZED_BOTH);
748
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748
749
             }
749
750
             
750
751
             maximized ^= true;
..
..
@@ -758,12 +759,17 @@
758
759
         
759
760
         void ToggleFullScreen()
760
761
         {
762
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
763
+
761
764
                 cameraView.ToggleFullScreen();
762
765
                 
763
766
                 if (!CameraPane.FULLSCREEN)
764
767
                 {
765
768
                     device.setFullScreenWindow(null);
769
+                    frame.dispose();
770
+                frame.setUndecorated(false);
766
771
             frame.validate();
772
+                    frame.setVisible(true);
767
773
                     
768
774
                     //frame.setVisible(false);
769
775
 //                frame.removeNotify();
..
..
@@ -789,8 +795,12 @@
789
795
 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790
796
 //                        frame.getToolkit().getScreenSize().height);
791
797
                     //frame.setVisible(false);
798
+                    
799
+            frame.dispose();
800
+                frame.setUndecorated(true);
792
801
                     device.setFullScreenWindow(frame);
793
802
             frame.validate();
803
+                    frame.setVisible(true);
794
804
 //                frame.removeNotify();
795
805
 //                frame.setUndecorated(true);
796
806
 //                frame.addNotify();
..
..
@@ -1613,12 +1623,13 @@
1613
1623
 
1614
1624
         frame.setSize(1280, 860);
1615
1625
         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
1619
1626
                     cameraView.requestFocusInWindow();
1620
1627
                     
1621
1628
         gridPanel.setDividerLocation(1.0);
1629
+        
1630
+        frame.validate();
1631
+
1632
+        frame.setVisible(true);
1622
1633
 
1623
1634
         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
1624
1635
         frame.addWindowListener(new WindowAdapter()