sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SDK :

Browse Source 
- Fixed focus issue in the sdk (part 2)

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9608 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
rem..om 2012-08-02 10:04:16 +00:00
parent 737b765cb0
commit 96b7355347
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/SceneComposerTopComponent.java
View File

@ -22,13 +22,9 @@ import com.jme3.gde.scenecomposer.tools.MoveTool;
import com.jme3.gde.scenecomposer.tools.RotateTool; import com.jme3.gde.scenecomposer.tools.RotateTool;
import com.jme3.gde.scenecomposer.tools.ScaleTool; import com.jme3.gde.scenecomposer.tools.ScaleTool;
import com.jme3.gde.scenecomposer.tools.SelectTool; import com.jme3.gde.scenecomposer.tools.SelectTool;
import com.jme3.input.awt.AwtKeyInput;
import com.jme3.input.event.KeyInputEvent;
import com.jme3.math.Vector3f; import com.jme3.math.Vector3f;
import com.jme3.scene.Node; import com.jme3.scene.Node;
import com.jme3.scene.Spatial; import com.jme3.scene.Spatial;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
import java.io.IOException; import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
@ -910,11 +906,11 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
} }
Collection<JmeSpatial> items = (Collection<JmeSpatial>) result.allInstances(); Collection<JmeSpatial> items = (Collection<JmeSpatial>) result.allInstances();
for (JmeSpatial spatial : items) { for (JmeSpatial spatial : items) {
selectSpatial(spatial); selectSpatial(spatial);
return; return;
} }
} }
private void selectSpatial(JmeSpatial spatial) { private void selectSpatial(JmeSpatial spatial) {
if (editorController != null) { if (editorController != null) {
editorController.setSelectedSpat(spatial); editorController.setSelectedSpat(spatial);
@ -935,6 +931,7 @@ private void scaleButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-F
} else { } else {
setSelectedObjectText(null); setSelectedObjectText(null);
} }
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{spatial});
SceneExplorerTopComponent.findInstance().setSelectedNode(spatial); SceneExplorerTopComponent.findInstance().setSelectedNode(spatial);
} }

14
sdk/jme3-scenecomposer/src/com/jme3/gde/scenecomposer/tools/SelectTool.java
View File

@ -467,13 +467,14 @@ public class SelectTool extends SceneEditTool {
@Override @Override
public void run() { public void run() {
if (selec != null) { if (selec != null) {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode.getChild(selec)}); doSelect();
SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode.getChild(selec));
} else {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode});
SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode);
} }
} }
private void doSelect() {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode.getChild(selec)});
SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode.getChild(selec));
}
}); });
} }
@ -641,9 +642,6 @@ public class SelectTool extends SceneEditTool {
if (cloned != null) { if (cloned != null) {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode.getChild(cloned)}); SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode.getChild(cloned)});
SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode.getChild(cloned)); SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode.getChild(cloned));
} else {
SceneViewerTopComponent.findInstance().setActivatedNodes(new org.openide.nodes.Node[]{rootNode});
SceneExplorerTopComponent.findInstance().setSelectedNode(rootNode);
} }
} }
}); });