Fix box and VR keys.

Normand Briere

2019-08-16 64e20f390e4b8e58bd0006dde8fa10fba1dac1d5

 ObjEditor.java
..
..
@@ -388,7 +388,8 @@
388
388
         //parent = p;
389
389
 
390
390
         GraphicsDevice gd = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
391
-        System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
391
+        if (Globals.DEBUG)
392
+            System.out.println("getFullScreenWindow? " + gd.getFullScreenWindow());
392
393
         //gd.setFullScreenWindow(this);
393
394
         //setResizable(false);
394
395
         //if (!isDisplayable())
..
..
@@ -1323,14 +1324,14 @@
1323
1324
             
1324
1325
         liveCB = AddCheckBox(setupPanel, "Live", copy.live);
1325
1326
                 liveCB.setToolTipText("Animate object");
1327
+        markCB = AddCheckBox(setupPanel, "Anim", copy.marked);
1328
+        markCB.setToolTipText("Set target transform");
1326
1329
         selectableCB = AddCheckBox(setupPanel, "Select", !copy.dontselect);
1327
1330
                 selectableCB.setToolTipText("Make object selectable");
1328
1331
 //            Return();
1329
1332
                 
1330
1333
         hideCB = AddCheckBox(setupPanel, "Hide", copy.hide);
1331
1334
                 hideCB.setToolTipText("Hide object");
1332
-        markCB = AddCheckBox(setupPanel, "Mark", copy.marked);
1333
-        markCB.setToolTipText("As animation target transform");
1334
1335
         
1335
1336
         ToolTipManager.sharedInstance().setLightWeightPopupEnabled(false);
1336
1337
         
..
..
@@ -1532,6 +1533,7 @@
1532
1533
 
1533
1534
         if (cam == null || !(copy.get(0) instanceof cGroup))
1534
1535
         {
1536
+        if (Globals.DEBUG)
1535
1537
             System.out.println("CREATE CAMERAS");
1536
1538
             cams = new cTemplate();
1537
1539
             cams.name = "Cameras";
..
..
@@ -2196,7 +2198,7 @@
2196
2198
             public void mouseClicked(MouseEvent e)
2197
2199
             {
2198
2200
                 borderfadeField.setFloat(0.5);
2199
-                opacityField.setFloat(0.6);
2201
+                opacityField.setFloat(0.75);
2200
2202
 
2201
2203
                 materialtouched = true;
2202
2204
                 applySelf();
..
..
@@ -2311,9 +2313,20 @@
2311
2313
 
2312
2314
         cGridBag huepanel = new cGridBag();
2313
2315
             cGridBag huelabel = new cGridBag();
2314
-        skin = GetLabel("icons/hue.png", false);
2315
-        skin.fit = true;
2316
-            huelabel.add(skin);
2316
+        cLabel hue = GetLabel("icons/hue.png", false);
2317
+        hue.fit = true;
2318
+        
2319
+        hue.addMouseListener(new MouseAdapter()
2320
+        {
2321
+            public void mousePressed(MouseEvent e)
2322
+            {
2323
+                int x = e.getX();
2324
+                
2325
+                colorField.setFloat((double)x / ((cLabel)e.getSource()).getWidth());
2326
+            }
2327
+        });
2328
+        
2329
+            huelabel.add(hue);
2317
2330
             huelabel.preferredWidth = 20;
2318
2331
             huepanel.add(new cGridBag()); // Label
2319
2332
             huepanel.add(huelabel); // Field/slider
..
..
@@ -5178,6 +5191,8 @@
5178
5191
         
5179
5192
         if (previousVersionButton != null && copy.versionlist != null)
5180
5193
             SetVersionStates();
5194
+        
5195
+        cameraView.requestFocusInWindow();
5181
5196
     }
5182
5197
     
5183
5198
     static TweenManager tweenManager = new TweenManager();
..
..
@@ -5209,7 +5224,7 @@
5209
5224
 //                group = (Composite) group.get(0);
5210
5225
 //            }
5211
5226
 
5212
-        System.out.println("makeSomething of " + thing);
5227
+        //System.out.println("makeSomething of " + thing);
5213
5228
 
5214
5229
         /*
5215
5230
         if (deselect && jList != null)