From 6432543395354a38c3c47ae32c553da627ae110b Mon Sep 17 00:00:00 2001 From: "rem..om" Date: Sat, 6 Aug 2011 16:43:02 +0000 Subject: [PATCH] sdk : - You can now select a material in material browser by double clicking it git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@7987 75d07b2b-3a1a-0410-a2c5-0572b91ccdca --- .../jme3/gde/materials/MaterialBrowser.form | 3 ++ .../jme3/gde/materials/MaterialBrowser.java | 30 ++++++++++++++----- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.form index 06d1007ed..a17c1e6c0 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.form @@ -61,6 +61,9 @@ + + + diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java index 00c78baf8..076f9c242 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/MaterialBrowser.java @@ -13,6 +13,7 @@ package com.jme3.gde.materials; import com.jme3.gde.core.assets.ProjectAssetManager; import com.jme3.gde.core.util.TreeUtil; import com.jme3.material.Material; +import java.awt.event.MouseEvent; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.io.FileReader; @@ -55,7 +56,7 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio jTree1.addTreeSelectionListener(this); } - private void setMaterial() { + private boolean setMaterial() { DefaultMutableTreeNode node = (DefaultMutableTreeNode) jTree1.getLastSelectedPathComponent(); if (node != null && node.isLeaf()) { @@ -64,11 +65,11 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio Material mat = assetManager.loadMaterial(selected); editor.setValue(mat); editor.setAsText(selected); - } else { - editor.setValue(null); - editor.setAsText(null); + return true; } + return false; + } private void setSelectedMaterial(Material material) { @@ -136,6 +137,11 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE); setTitle(org.openide.util.NbBundle.getMessage(MaterialBrowser.class, "MaterialBrowser.title")); // NOI18N + jTree1.addMouseListener(new java.awt.event.MouseAdapter() { + public void mouseClicked(java.awt.event.MouseEvent evt) { + jTree1MouseClicked(evt); + } + }); jScrollPane1.setViewportView(jTree1); jPanel1.setBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(153, 153, 153))); @@ -218,15 +224,25 @@ public class MaterialBrowser extends javax.swing.JDialog implements TreeSelectio }// //GEN-END:initComponents private void okButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_okButtonActionPerformed - setMaterial(); - dispose(); - materialPreviewWidget1.cleanUp(); + if (setMaterial()) { + dispose(); + materialPreviewWidget1.cleanUp(); + } + }//GEN-LAST:event_okButtonActionPerformed private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed dispose(); materialPreviewWidget1.cleanUp(); }//GEN-LAST:event_cancelButtonActionPerformed + +private void jTree1MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jTree1MouseClicked + if (evt.getButton() == MouseEvent.BUTTON1 && evt.getClickCount() == 2) { + if (setMaterial()) { + dispose(); + } + } +}//GEN-LAST:event_jTree1MouseClicked // Variables declaration - do not modify//GEN-BEGIN:variables private javax.swing.JButton cancelButton; private javax.swing.JPanel jPanel1;