Use separators.

Normand Briere

2019-04-29 8c837a9e50c29e66bdf5bd7ea2fd15b1a7d5d598

 ObjEditor.java
..
..
@@ -978,10 +978,10 @@
978
978
         fasterButton = AddButton(oe, "Fast");
979
979
         remarkButton = AddButton(oe, "Rem");
980
980
 
981
-        Return();
981
+        //Return();
982
982
 
983
-    normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
-    Return();
983
+    //normalpushField = AddSlider(oe.ctrlPanel, "Push", -10, 10, 0, -1);
984
+    //Return();
985
985
             
986
986
 //	oe.ctrlPanel.add(stepButton = new cButton("Step"), ObjEditor.aConstraints, oe.ctrlPanel.getComponentCount() - 2);
987
987
 //        ObjEditor.aConstraints.gridx += 1;
..
..
@@ -1445,17 +1445,13 @@
1445
1445
         //aConstraints.gridx += 1;
1446
1446
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1447
1447
 
1448
-        JPanel colorPanel = new JPanel(new BorderLayout());
1449
-        colorPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1450
-        
1451
1448
         cGridBag colorSection = new cGridBag().setVertical(true);
1452
-        
1453
-        colorPanel.add(colorSection);
1454
1449
         
1455
1450
         cGridBag color = new cGridBag();
1456
1451
                 color.add(colorLabel = new JLabel("Color/hue")); // , aConstraints);
1457
1452
                 colorLabel.setHorizontalAlignment(SwingConstants.TRAILING);
1458
1453
                 color.add(colorField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1454
+        //colorField.preferredWidth = 200;
1459
1455
         colorSection.add(color);
1460
1456
 
1461
1457
         cGridBag modulation = new cGridBag();
..
..
@@ -1488,16 +1484,13 @@
1488
1484
                 shadowbias.add(shadowbiasField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1489
1485
         colorSection.add(shadowbias);
1490
1486
 
1491
-        ctrlPanel.add(colorPanel);
1487
+        ctrlPanel.add(new JSeparator());
1488
+        
1489
+        ctrlPanel.add(colorSection);
1492
1490
         
1493
1491
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1494
1492
         
1495
-        JPanel diffusePanel = new JPanel(new BorderLayout());
1496
-        diffusePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1497
-        
1498
1493
         cGridBag diffuseSection = new cGridBag().setVertical(true);
1499
-        
1500
-        diffusePanel.add(diffuseSection);
1501
1494
         
1502
1495
         cGridBag diffuse = new cGridBag();
1503
1496
                 diffuse.add(diffuseLabel = new JLabel("Diffuse")); // , aConstraints);
..
..
@@ -1541,16 +1534,13 @@
1541
1534
                 fakedepth.add(fakedepthField = new cNumberSlider(this, 0.001, 50, -1)); // , aConstraints);
1542
1535
         diffuseSection.add(fakedepth);
1543
1536
 
1544
-        ctrlPanel.add(diffusePanel);
1537
+        ctrlPanel.add(new JSeparator());
1538
+        
1539
+        ctrlPanel.add(diffuseSection);
1545
1540
         
1546
1541
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1547
1542
         
1548
-        JPanel specularPanel = new JPanel(new BorderLayout());
1549
-        specularPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1550
-        
1551
1543
         cGridBag specularSection = new cGridBag().setVertical(true);
1552
-        
1553
-        specularPanel.add(specularSection);
1554
1544
 
1555
1545
         cGridBag specular = new cGridBag();
1556
1546
                 specular.add(specularLabel = new JLabel("Specular")); // , aConstraints);
..
..
@@ -1595,16 +1585,13 @@
1595
1585
 //		aConstraints.gridwidth = 1;
1596
1586
 
1597
1587
 
1598
-        ctrlPanel.add(specularPanel);
1588
+        ctrlPanel.add(new JSeparator());
1589
+        
1590
+        ctrlPanel.add(specularSection);
1599
1591
         
1600
1592
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1601
1593
         
1602
-        JPanel globalPanel = new JPanel(new BorderLayout());
1603
-        globalPanel.setBorder(BorderFactory.createLineBorder(Color.black));
1604
-        
1605
1594
         cGridBag globalSection = new cGridBag().setVertical(true);
1606
-        
1607
-        globalPanel.add(globalSection);
1608
1595
 
1609
1596
         cGridBag camera = new cGridBag();
1610
1597
                 camera.add(cameraLabel = new JLabel("GlobalLight")); // , aConstraints);
..
..
@@ -1630,16 +1617,13 @@
1630
1617
                 opacity.add(opacityField = new cNumberSlider(this, 0.001, 1, -0.5)); // , aConstraints);
1631
1618
         globalSection.add(opacity);
1632
1619
 
1633
-        ctrlPanel.add(globalPanel);
1620
+        ctrlPanel.add(new JSeparator());
1621
+        
1622
+        ctrlPanel.add(globalSection);
1634
1623
         
1635
1624
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1636
1625
         
1637
-        JPanel texturePanel = new JPanel(new BorderLayout());
1638
-        texturePanel.setBorder(BorderFactory.createLineBorder(Color.black));
1639
-        
1640
1626
         cGridBag textureSection = new cGridBag().setVertical(true);
1641
-        
1642
-        texturePanel.add(textureSection);
1643
1627
 
1644
1628
         cGridBag bump = new cGridBag();
1645
1629
                 bump.add(bumpLabel = new JLabel("Bump")); // , aConstraints);
..
..
@@ -1677,7 +1661,9 @@
1677
1661
                 opacityPower.add(opacityPowerField = new cNumberSlider(this, 0.0, 10 /*10 dec 2013*/)); // , aConstraints);
1678
1662
         textureSection.add(opacityPower);
1679
1663
 
1680
-        ctrlPanel.add(texturePanel);
1664
+        ctrlPanel.add(new JSeparator());
1665
+        
1666
+        ctrlPanel.add(textureSection);
1681
1667
         
1682
1668
         //ctrlPanel.add(new JLabel("----------------------------------")); // , aConstraints);
1683
1669