New maximize button.

Normand Briere

2019-09-02 0216409e390b2005d6bc4eaf564ef9ca2e508dab

 ObjEditor.java
..
..
@@ -906,10 +906,20 @@
906
906
         
907
907
 	cButton minButton;
908
908
 	cButton maxButton;
909
-	cButton fullButton;
909
+	cButton fullScreenButton;
910
910
 	cButton collapseButton;
911
911
         cButton maximize3DButton;
912
912
         
913
+    public void Show3DView()
914
+    {
915
+        // bug
916
+        //gridPanel.setDividerLocation(1.0);
917
+        //bigPanel.setDividerLocation(0.0);
918
+        bigThree.ClearUI();
919
+        bigThree.add(centralPanel);
920
+        bigThree.FlushUI();
921
+    }
922
+
913
923
         void ToggleFullScreen()
914
924
         {
915
925
             GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
..
..
@@ -936,14 +946,18 @@
936
946
 //                    framePanel.setDividerLocation(46); // icons are 24x24
937
947
                     
938
948
                     //frame.setVisible(true);
939
-//                    radio.layout = keepButton;
949
+                    radio.layout = keepButton;
940
950
                     //theFrame = null;
941
951
                     keepButton = null;
942
-//                    radio.layout.doClick();
952
+                    radio.layout.doClick();
943
953
                     
944
954
                 } else
945
955
                 {
946
956
                     keepButton = radio.layout;
957
+                    
958
+                    radio.layout = twoButton;
959
+                    Show3DView();
960
+                        
947
961
                     //keeprect = frame.getBounds();
948
962
 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
949
963
 //                        frame.getToolkit().getScreenSize().height);
..
..
@@ -965,6 +979,7 @@
965
979
 //                    radio.layout = fullscreenLayout;
966
980
 //                    radio.layout.doClick();
967
981
                     //frame.setVisible(true);
982
+                    CollapseToolbar();
968
983
                 }
969
984
             frame.validate();
970
985
             
..
..
@@ -1985,11 +2000,16 @@
1985
2000
                     {
1986
2001
                         if ((Integer)pce.getOldValue() == 1)
1987
2002
                         {
1988
-                            if (radio.layout != expandedLayout)
2003
+                            if (CameraPane.FULLSCREEN)
1989
2004
                             {
1990
-                                radio.layout = expandedLayout;
1991
-                                radio.layout.doClick();
2005
+                                ToggleFullScreen();
1992
2006
                             }
2007
+                            
2008
+//                            if (radio.layout != expandedLayout)
2009
+//                            {
2010
+//                                radio.layout = expandedLayout;
2011
+//                                radio.layout.doClick();
2012
+//                            }
1993
2013
                         }
1994
2014
                     }
1995
2015
                 });