Fix multiple selection

Normand Briere

2019-06-27 f78dd18c66d607b693c0bf5937fc59181bf5a26b

 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.
..
..
@@ -458,7 +461,13 @@
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
+    
462
471
         //ctrlPanel.setLayout(new GridLayout(4, 1, 5, 5));
463
472
         //mainPanel.setLayout(new GridBagLayout());
464
473
         toolbarPanel.setLayout(new FlowLayout(FlowLayout.LEFT));
..
..
@@ -1125,7 +1134,7 @@
1125
1134
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1126
1135
                 hideCB.setToolTipText("Hide object");
1127
1136
         markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1128
-        markCB.setToolTipText("Set the animation target transform");
1137
+        markCB.setToolTipText("As animation target transform");
1129
1138
         
1130
1139
             setupPanel2 = new cGridBag().setVertical(false);
1131
1140
             
..
..
@@ -1133,7 +1142,7 @@
1133
1142
         rewindCB.setToolTipText("Rewind animation");
1134
1143
         
1135
1144
         randomCB = AddCheckBox(setupPanel2, "Rand", copy.random);
1136
-        randomCB.setToolTipText("Randomly Rewind or Go back and forth");
1145
+        randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
1137
1146
 
1138
1147
         if (Globals.ADVANCED)
1139
1148
         {
..
..
@@ -3017,12 +3026,17 @@
3017
3026
 //                }
3018
3027
 
3019
3028
         /**/
3020
-        if (deselect)
3029
+        if (deselect || child == null)
3021
3030
         {
3022
3031
             //group.deselectAll();
3023
3032
             //freeze = true;
3024
3033
             GetTree().clearSelection();
3025
3034
             //freeze = false;
3035
+            
3036
+            if (child == null)
3037
+            {
3038
+                return;
3039
+            }
3026
3040
         }
3027
3041
 
3028
3042
         //group.addSelectee(child);