New maximize button.

Normand Briere

2019-09-02 0216409e390b2005d6bc4eaf564ef9ca2e508dab

New maximize button.

 GroupEditor.java
..
..
@@ -368,16 +368,6 @@
368
368
         refreshContents();
369
369
     }
370
370
 
371
-    public void Show3DView()
372
-    {
373
-        // bug
374
-        //gridPanel.setDividerLocation(1.0);
375
-        //bigPanel.setDividerLocation(0.0);
376
-        bigThree.ClearUI();
377
-        bigThree.add(centralPanel);
378
-        bigThree.FlushUI();
379
-    }
380
-
381
371
     //ObjEditor objEditor;
382
372
 	public void closeUI2()
383
373
 	{
..
..
@@ -1081,13 +1071,17 @@
1081
1071
 //                        }
1082
1072
 //                });
1083
1073
                 
1074
+		oe.toolbarPanel.add(fullScreenButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1075
+                fullScreenButton.setToolTipText("Full-screen window");
1076
+		fullScreenButton.addActionListener(this);
1077
+                
1084
1078
 		oe.toolbarPanel.add(collapseButton = GetButton("icons/collapse.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1085
1079
                 collapseButton.setToolTipText("Collapse toolbar");
1086
1080
 		collapseButton.addActionListener(this);
1087
1081
                 
1088
-		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1089
-                maximize3DButton.setToolTipText("Maximize 3D view");
1090
-		maximize3DButton.addActionListener(this);
1082
+//		oe.toolbarPanel.add(maximize3DButton = GetButton("icons/square.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1083
+//                maximize3DButton.setToolTipText("Maximize 3D view");
1084
+//		maximize3DButton.addActionListener(this);
1091
1085
                 
1092
1086
 		oe.toolbarPanel.add(twoButton = GetButton("icons/cube.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1093
1087
                 twoButton.setToolTipText("Show 3D view only");
..
..
@@ -1107,10 +1101,6 @@
1107
1101
 //                sevenButton.setToolTipText("3-column layout");
1108
1102
 //		sevenButton.addActionListener(this);
1109
1103
                 //
1110
-                
1111
-		oe.toolbarPanel.add(fullButton = GetButton("icons/fullscreen.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1112
-                fullButton.setToolTipText("Full-screen window");
1113
-		fullButton.addActionListener(this);
1114
1104
                 
1115
1105
 		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Globals.NIMBUSLAF)); //, oe.aConstraints);
1116
1106
                 screenfitButton.setToolTipText("Screen fit");
..
..
@@ -2807,7 +2797,7 @@
2807
2797
 		{
2808
2798
 			Maximize();
2809
2799
 		} else
2810
-		if (source == fullButton)
2800
+		if (source == fullScreenButton)
2811
2801
 		{
2812
2802
 			ToggleFullScreen();
2813
2803
 		} else
..
..
@@ -2816,13 +2806,13 @@
2816
2806
                         this.expandedLayout = radio.layout;
2817
2807
 			CollapseToolbar();
2818
2808
 		} else
2819
-		if (source == maximize3DButton)
2820
-		{
2821
-                        this.expandedLayout = radio.layout;
2822
-                        radio.layout = twoButton;
2823
-                        Show3DView();
2824
-			CollapseToolbar();
2825
-		} else
2809
+//		if (source == maximize3DButton)
2810
+//		{
2811
+//                        this.expandedLayout = radio.layout;
2812
+//                        radio.layout = twoButton;
2813
+//			CollapseToolbar();
2814
+//                        Show3DView();
2815
+//		} else
2826
2816
 		if (source == previousVersionButton)
2827
2817
 		{
2828
2818
                         // Go to previous version
..
..
@@ -4169,9 +4159,10 @@
4169
4159
             // and check if any of these nodes are reachable below the root.
4170
4160
             Grafreed.grafreed.universe.TagObjects(copy, true);
4171
4161
             
4172
-            if (copy instanceof Composite && copy.versionlist == null && !copy.HasTags())
4162
+            if (copy instanceof Composite && !copy.HasTags())
4173
4163
             {
4174
-                copy.versionlist = new Object3D[100];
4164
+                if (copy.versionlist == null)
4165
+                    copy.versionlist = new Object3D[100];
4175
4166
                 
4176
4167
                 //Save(true);
4177
4168
             }
 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
                 });