Fix ungroup.

Normand Briere

2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8

 ObjEditor.java
..
..
@@ -15,6 +15,9 @@
15
15
 //import javax.swing.plaf.ColorUIResource;
16
16
 //import javax.swing.plaf.metal.DefaultMetalTheme;
17
17
 
18
+import javax.swing.plaf.basic.BasicSplitPaneDivider;
19
+import javax.swing.plaf.basic.BasicSplitPaneUI;
20
+
18
21
 //import javax.media.opengl.GLCanvas;
19
22
 
20
23
 import //weka.core.
..
..
@@ -446,7 +449,7 @@
446
449
 // TEXTAREA           infoarea.setLineWrap(true);
447
450
 // TEXTAREA           infoarea.setWrapStyleWord(true);
448
451
         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
449
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        //infoPanel.setPreferredSize(new Dimension(50, 200));
450
453
         infoPanel.setName("Info");
451
454
         //infoPanel.setLayout(new BorderLayout());
452
455
         //infoPanel.add(createTextPane());
..
..
@@ -458,7 +461,14 @@
458
461
         mainPanel.setDividerSize(9);
459
462
         mainPanel.setDividerLocation(0.5); //1.0);
460
463
         mainPanel.setResizeWeight(0.5);
461
-
464
+        
465
+//mainPanel.setDividerSize((int) (mainPanel.getDividerSize() * 1.5));
466
+    BasicSplitPaneDivider divider = ( (BasicSplitPaneUI) mainPanel.getUI()).getDivider();
467
+    divider.setDividerSize(15);
468
+    divider.setBorder(BorderFactory.createTitledBorder(divider.getBorder(), "Custom border title -- gets rid of the one-touch arrows!"));    
469
+    
470
+    mainPanel.setUI(new BasicSplitPaneUI());
471
+    
462
472
         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463
473
         //mainPanel.setLayout(new GridBagLayout());
464
474
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..
..
@@ -711,10 +721,19 @@
711
721
         void Minimize()
712
722
         {
713
723
             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
714
725
         }
715
726
         
727
+//        artifactURI=null, type=0, property=${file.reference.jfxrt.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@6767876f, broken=false, additional={}
728
+//        artifactURI=null, type=0, property=${file.reference.mac-ui.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@16bdc817, broken=false, additional={}
729
+//        artifactURI=null, type=0, property=${file.reference.classes.jar}, object=org.netbeans.modules.java.api.common.classpath.ClassPathSupport$RelativePath@9daa9c17, broken=false, additional={}
716
730
         void Maximize()
717
731
         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
718
737
             if (maximized)
719
738
             {
720
739
                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
..
..
@@ -729,7 +748,13 @@
729
748
             }
730
749
             
731
750
             maximized ^= true;
751
+            
752
+            frame.validate();
732
753
         }
754
+        
755
+	cButton minButton;
756
+	cButton maxButton;
757
+	cButton fullButton;
733
758
         
734
759
         void ToggleFullScreen()
735
760
         {
..
..
@@ -738,6 +763,8 @@
738
763
                 if (!CameraPane.FULLSCREEN)
739
764
                 {
740
765
                     device.setFullScreenWindow(null);
766
+            frame.validate();
767
+                    
741
768
                     //frame.setVisible(false);
742
769
 //                frame.removeNotify();
743
770
 //                frame.setUndecorated(false);
..
..
@@ -763,6 +790,7 @@
763
790
 //                        frame.getToolkit().getScreenSize().height);
764
791
                     //frame.setVisible(false);
765
792
                     device.setFullScreenWindow(frame);
793
+            frame.validate();
766
794
 //                frame.removeNotify();
767
795
 //                frame.setUndecorated(true);
768
796
 //                frame.addNotify();
..
..
@@ -775,6 +803,7 @@
775
803
                     radio.layout.doClick();
776
804
                     //frame.setVisible(true);
777
805
                 }
806
+            frame.validate();
778
807
         }
779
808
 
780
809
     private JTextPane createTextPane()
..
..
@@ -1107,7 +1136,7 @@
1107
1136
             namePanel = new cGridBag();
1108
1137
             
1109
1138
         nameField = AddText(namePanel, copy.GetName());
1110
-        namePanel.add(nameField);
1139
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
1111
1140
         oe.ctrlPanel.add(namePanel);
1112
1141
         
1113
1142
         oe.ctrlPanel.Return();
..
..
@@ -1125,15 +1154,15 @@
1125
1154
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126
1155
                 hideCB.setToolTipText("Hide object");
1127
1156
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128
-        markCB.setToolTipText("Set the animation target transform");
1157
+        markCB.setToolTipText("As animation target transform");
1129
1158
         
1130
1159
             setupPanel2 = new cGridBag().setVertical(false);
1131
1160
             
1132
1161
         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
1133
1162
         rewindCB.setToolTipText("Rewind animation");
1134
1163
         
1135
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1164
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
1165
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137
1166
 
1138
1167
         if (Globals.ADVANCED)
1139
1168
         {
..
..
@@ -1676,24 +1705,6 @@
1676
1705
                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1677
1706
         colorSection.add(texture);
1678
1707
 
1679
-        cGridBag anisoU = new cGridBag();
1680
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1681
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1682
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1683
-        colorSection.add(anisoU);
1684
-
1685
-        cGridBag anisoV = new cGridBag();
1686
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1687
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1688
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1689
-        colorSection.add(anisoV);
1690
-
1691
-        cGridBag shadowbias = new cGridBag();
1692
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1693
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1694
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1695
-        colorSection.add(shadowbias);
1696
-
1697
1708
         panel.add(new JSeparator());
1698
1709
         
1699
1710
         panel.add(colorSection);
..
..
@@ -1743,6 +1754,12 @@
1743
1754
                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1744
1755
                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1745
1756
         diffuseSection.add(fakedepth);
1757
+
1758
+        cGridBag shadowbias = new cGridBag();
1759
+                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1760
+                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1761
+                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1762
+        diffuseSection.add(shadowbias);
1746
1763
 
1747
1764
         panel.add(new JSeparator());
1748
1765
         
..
..
@@ -1794,6 +1811,18 @@
1794
1811
 //		aConstraints.gridy += 1;
1795
1812
 //		aConstraints.gridwidth = 1;
1796
1813
 
1814
+        cGridBag anisoU = new cGridBag();
1815
+                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1816
+                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1817
+                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1818
+        specularSection.add(anisoU);
1819
+
1820
+        cGridBag anisoV = new cGridBag();
1821
+                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1822
+                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1823
+                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1824
+        specularSection.add(anisoV);
1825
+
1797
1826
 
1798
1827
         panel.add(new JSeparator());
1799
1828
         
..
..
@@ -1801,35 +1830,35 @@
1801
1830
         
1802
1831
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1803
1832
         
1804
-        cGridBag globalSection = new cGridBag().setVertical(true);
1833
+        //cGridBag globalSection = new cGridBag().setVertical(true);
1805
1834
 
1806
1835
         cGridBag camera = new cGridBag();
1807
1836
                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
1808
1837
                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1809
1838
                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1810
-        globalSection.add(camera);
1839
+        colorSection.add(camera);
1811
1840
 
1812
1841
         cGridBag ambient = new cGridBag();
1813
1842
                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
1814
1843
                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1815
1844
                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1816
-        globalSection.add(ambient);
1845
+        colorSection.add(ambient);
1817
1846
 
1818
1847
         cGridBag backlit = new cGridBag();
1819
1848
                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
1820
1849
                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1821
1850
                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1822
-        globalSection.add(backlit);
1851
+        colorSection.add(backlit);
1823
1852
 
1824
1853
         cGridBag opacity = new cGridBag();
1825
1854
                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
1826
1855
                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1827
1856
                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1828
-        globalSection.add(opacity);
1857
+        colorSection.add(opacity);
1829
1858
 
1830
-        panel.add(new JSeparator());
1859
+        //panel.add(new JSeparator());
1831
1860
         
1832
-        panel.add(globalSection);
1861
+        //panel.add(globalSection);
1833
1862
         
1834
1863
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1835
1864
         
..
..
@@ -3017,12 +3046,17 @@
3017
3046
 //                }
3018
3047
 
3019
3048
         /**/
3020
-        if (deselect)
3049
+        if (deselect || child == null)
3021
3050
         {
3022
3051
             //group.deselectAll();
3023
3052
             //freeze = true;
3024
3053
             GetTree().clearSelection();
3025
3054
             //freeze = false;
3055
+            
3056
+            if (child == null)
3057
+            {
3058
+                return;
3059
+            }
3026
3060
         }
3027
3061
 
3028
3062
         //group.addSelectee(child);
..
..
@@ -3523,8 +3557,10 @@
3523
3557
         
3524
3558
         copy.ExtractBigData(hashtable);
3525
3559
         
3560
+        byte[] compress = Compress(copy);
3561
+        
3526
3562
         //EditorFrame.m_MainFrame.requestFocusInWindow();
3527
-        tab.graphs[tab.undoindex++] = Compress(copy);
3563
+        tab.graphs[tab.undoindex++] = compress;
3528
3564
 
3529
3565
         copy.RestoreBigData(hashtable);
3530
3566