blame | history | patch | commit | commitdiff
Normand Briere
2019-06-29 a69bb4474a3264a9a7a7f8b8d8154ea771f167c8 
 ObjEditor.java
....@@ -449,7 +449,7 @@
449449 // TEXTAREA           infoarea.setLineWrap(true);
450450 // TEXTAREA           infoarea.setWrapStyleWord(true);
451451         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        infoPanel.setPreferredSize(new Dimension(50, 200));
452
+        //infoPanel.setPreferredSize(new Dimension(50, 200));
453453         infoPanel.setName("Info");
454454         //infoPanel.setLayout(new BorderLayout());
455455         //infoPanel.add(createTextPane());
....@@ -463,10 +463,11 @@
463463         mainPanel.setResizeWeight(0.5);
464464         
465465 //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!"));    
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!"));    
469469     
470
+    mainPanel.setUI(new BasicSplitPaneUI());
470471     
471472         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
472473         //mainPanel.setLayout(new GridBagLayout());
....@@ -720,10 +721,19 @@
720721         void Minimize()
721722         {
722723             frame.setState(Frame.ICONIFIED);
724
+            frame.validate();
723725         }
724726         
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={}
725730         void Maximize()
726731         {
732
+            if (CameraPane.FULLSCREEN)
733
+            {
734
+                ToggleFullScreen();
735
+            }
736
+            
727737             if (maximized)
728738             {
729739                 frame.setBounds(keeprect.x, keeprect.y, keeprect.width, keeprect.height);
....@@ -738,7 +748,13 @@
738748             }
739749             
740750             maximized ^= true;
751
+            
752
+            frame.validate();
741753         }
754
+        
755
+	cButton minButton;
756
+	cButton maxButton;
757
+	cButton fullButton;
742758         
743759         void ToggleFullScreen()
744760         {
....@@ -747,6 +763,8 @@
747763                 if (!CameraPane.FULLSCREEN)
748764                 {
749765                     device.setFullScreenWindow(null);
766
+            frame.validate();
767
+                    
750768                     //frame.setVisible(false);
751769 //                frame.removeNotify();
752770 //                frame.setUndecorated(false);
....@@ -772,6 +790,7 @@
772790 //                        frame.getToolkit().getScreenSize().height);
773791                     //frame.setVisible(false);
774792                     device.setFullScreenWindow(frame);
793
+            frame.validate();
775794 //                frame.removeNotify();
776795 //                frame.setUndecorated(true);
777796 //                frame.addNotify();
....@@ -784,6 +803,7 @@
784803                     radio.layout.doClick();
785804                     //frame.setVisible(true);
786805                 }
806
+            frame.validate();
787807         }
788808 
789809     private JTextPane createTextPane()
....@@ -1116,7 +1136,7 @@
11161136             namePanel = new cGridBag();
11171137             
11181138         nameField = AddText(namePanel, copy.GetName());
1119
-        namePanel.add(nameField);
1139
+        namePanel.add(new JScrollPane(nameField, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER));
11201140         oe.ctrlPanel.add(namePanel);
11211141         
11221142         oe.ctrlPanel.Return();
....@@ -1141,7 +1161,7 @@
11411161         rewindCB = AddCheckBox(setupPanel2, "Rewind", copy.rewind);
11421162         rewindCB.setToolTipText("Rewind animation");
11431163         
1144
-        randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1164
+        randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11451165         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11461166 
11471167         if (Globals.ADVANCED)
....@@ -1685,24 +1705,6 @@
16851705                 texture.add(textureField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
16861706         colorSection.add(texture);
16871707 
1688
-        cGridBag anisoU = new cGridBag();
1689
-                anisoU.add(anisoLabel = new JLabel("AnisoU")); // , aConstraints);
1690
-                anisoLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1691
-                anisoU.add(anisoField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1692
-        colorSection.add(anisoU);
1693
-
1694
-        cGridBag anisoV = new cGridBag();
1695
-                anisoV.add(anisoVLabel = new JLabel("AnisoV")); // , aConstraints);
1696
-                anisoVLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1697
-                anisoV.add(anisoVField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1698
-        colorSection.add(anisoV);
1699
-
1700
-        cGridBag shadowbias = new cGridBag();
1701
-                shadowbias.add(shadowbiasLabel = new JLabel("Shadowbias")); // , aConstraints);
1702
-                shadowbiasLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1703
-                shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1704
-        colorSection.add(shadowbias);
1705
-
17061708         panel.add(new JSeparator());
17071709         
17081710         panel.add(colorSection);
....@@ -1752,6 +1754,12 @@
17521754                 fakedepthLabel.setHorizontalAlignment(SwingConstants.TRAILING);
17531755                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
17541756         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);
17551763 
17561764         panel.add(new JSeparator());
17571765         
....@@ -1803,6 +1811,18 @@
18031811 //		aConstraints.gridy += 1;
18041812 //		aConstraints.gridwidth = 1;
18051813 
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
+
18061826 
18071827         panel.add(new JSeparator());
18081828         
....@@ -1810,35 +1830,35 @@
18101830         
18111831         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18121832         
1813
-        cGridBag globalSection = new cGridBag().setVertical(true);
1833
+        //cGridBag globalSection = new cGridBag().setVertical(true);
18141834 
18151835         cGridBag camera = new cGridBag();
18161836                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
18171837                 cameraLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18181838                 camera.add(cameraField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1819
-        globalSection.add(camera);
1839
+        colorSection.add(camera);
18201840 
18211841         cGridBag ambient = new cGridBag();
18221842                 ambient.add(ambientLabel = new JLabel("Ambient")); // , aConstraints);
18231843                 ambientLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18241844                 ambient.add(ambientField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1825
-        globalSection.add(ambient);
1845
+        colorSection.add(ambient);
18261846 
18271847         cGridBag backlit = new cGridBag();
18281848                 backlit.add(backlitLabel = new JLabel("Backlit")); // , aConstraints);
18291849                 backlitLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18301850                 backlit.add(backlitField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1831
-        globalSection.add(backlit);
1851
+        colorSection.add(backlit);
18321852 
18331853         cGridBag opacity = new cGridBag();
18341854                 opacity.add(opacityLabel = new JLabel("Opacity")); // , aConstraints);
18351855                 opacityLabel.setHorizontalAlignment(SwingConstants.TRAILING);
18361856                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1837
-        globalSection.add(opacity);
1857
+        colorSection.add(opacity);
18381858 
1839
-        panel.add(new JSeparator());
1859
+        //panel.add(new JSeparator());
18401860         
1841
-        panel.add(globalSection);
1861
+        //panel.add(globalSection);
18421862         
18431863         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
18441864         
....@@ -3537,8 +3557,10 @@
35373557         
35383558         copy.ExtractBigData(hashtable);
35393559         
3560
+        byte[] compress = Compress(copy);
3561
+        
35403562         //EditorFrame.m_MainFrame.requestFocusInWindow();
3541
-        tab.graphs[tab.undoindex++] = Compress(copy);
3563
+        tab.graphs[tab.undoindex++] = compress;
35423564 
35433565         copy.RestoreBigData(hashtable);
35443566