Toolbox + DnD

Normand Briere

2019-06-24 47cd0f0a3870d843cb758535316060d30f15c811

 ObjEditor.java
..
..
@@ -52,6 +52,19 @@
52
52
         }
53
53
     }
54
54
 
55
+    cToggleButton GetToggleButton(String name, boolean border)
56
+    {
57
+        try
58
+        {
59
+            ImageIcon icon = GetIcon(name);
60
+            return new cToggleButton(icon, border);
61
+        }
62
+        catch (Exception e)
63
+        {
64
+            return new cToggleButton(name, border);
65
+        }
66
+    }
67
+
55
68
     cCheckBox GetCheckBox(String name, boolean border)
56
69
     {
57
70
         try
..
..
@@ -384,9 +397,12 @@
384
397
         editPanel.add(editCommandsPanel);
385
398
         editPanel.add(ctrlPanel);
386
399
                 
387
-        materialPanel = new cGridBag().setVertical(true);
400
+        toolboxPanel = new cGridBag().setVertical(false);
401
+        toolboxPanel.setName("Toolbox");
388
402
         
403
+        materialPanel = new cGridBag().setVertical(true);
389
404
         materialPanel.setName("Material");
405
+        
390
406
         /*JTextPane*/
391
407
         infoarea = createTextPane();
392
408
         doc = infoarea.getStyledDocument();
..
..
@@ -659,6 +675,8 @@
659
675
         
660
676
         boolean maximized;
661
677
     
678
+        cButton fullscreenLayout;
679
+
662
680
         void Minimize()
663
681
         {
664
682
             frame.setState(Frame.ICONIFIED);
..
..
@@ -720,7 +738,7 @@
720
738
 // X                   frame.getContentPane().add(/*"Center",*/bigThree);
721
739
                     framePanel.setDividerLocation(0);
722
740
 
723
-                    radio.layout = twoButton;
741
+                    radio.layout = fullscreenLayout;
724
742
                     radio.layout.doClick();
725
743
                     //frame.setVisible(true);
726
744
                 }
..
..
@@ -1394,6 +1412,7 @@
1394
1412
 
1395
1413
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1396
1414
         //tmp.setName("Edit");
1415
+        objectPanel.add(toolboxPanel);
1397
1416
         objectPanel.add(materialPanel);
1398
1417
 //        JPanel north = new JPanel(new BorderLayout());
1399
1418
 //        north.setName("Edit");
..
..
@@ -3726,7 +3745,7 @@
3726
3745
         assert false;
3727
3746
     }
3728
3747
 
3729
-    void EditSelection()
3748
+    void EditSelection(boolean newWindow)
3730
3749
     {
3731
3750
     }
3732
3751
 
..
..
@@ -4221,7 +4240,7 @@
4221
4240
 
4222
4241
     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
4223
4242
     {
4224
-        if (Globals.SAVEONMAKE)
4243
+        if (Globals.SAVEONMAKE) // && resetmodel)
4225
4244
             Save();
4226
4245
         //Tween.set(thing, 0).target(1).start(tweenManager);
4227
4246
         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
..
..
@@ -4309,6 +4328,12 @@
4309
4328
         {
4310
4329
             ResetModel();
4311
4330
             Select(thing.GetTreePath(), true, false); // unselect... false);
4331
+            
4332
+        if (thing.Size() == 0)
4333
+        {
4334
+            //EditSelection(false);
4335
+        }
4336
+        
4312
4337
             refreshContents();
4313
4338
         }
4314
4339
 
..
..
@@ -4903,18 +4928,29 @@
4903
4928
     CheckboxMenuItem togglePaintItem;
4904
4929
     JSplitPane mainPanel;
4905
4930
     JScrollPane scrollpane;
4931
+    
4906
4932
     JPanel toolbarPanel;
4933
+    
4907
4934
     cGridBag treePanel;
4935
+    
4908
4936
     JPanel radioPanel;
4909
4937
     ButtonGroup buttonGroup;
4910
-    cGridBag ctrlPanel;
4938
+    
4939
+    cGridBag toolboxPanel;
4911
4940
     cGridBag materialPanel;
4941
+    cGridBag ctrlPanel;
4942
+    
4912
4943
     JScrollPane infoPanel;
4944
+    
4913
4945
     cGridBag optionsPanel;
4946
+    
4914
4947
     JTabbedPane objectPanel;
4948
+    
4915
4949
     cGridBag XYZPanel;
4950
+    
4916
4951
     JSplitPane gridPanel;
4917
4952
     JSplitPane bigPanel;
4953
+    
4918
4954
     cGridBag bigThree;
4919
4955
     cGridBag scenePanel;
4920
4956
     cGridBag centralPanel;
..
..
@@ -5029,7 +5065,7 @@
5029
5065
     cNumberSlider fogField;
5030
5066
     JLabel opacityPowerLabel;
5031
5067
     cNumberSlider opacityPowerField;
5032
-    JTree jTree;
5068
+    cTree jTree;
5033
5069
     //ObjectUI parent;
5034
5070
     
5035
5071
     cNumberSlider normalpushField;