- fix material editor layout for some window managers (thanks to @madlion)

git-svn-id: http://jmonkeyengine.googlecode.com/svn/trunk@7938 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form
index 6ca8017..5e1e741 100644 (file)
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form
+++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.form
@@ -51,7 +51,7 @@
               <Dimension value="[100, 16]"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[100, 0]"/>
+              <Dimension value="[100, 16]"/>
             </Property>
           </Properties>
         </Component>

diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java
index ddd4b80..b28ee9c 100644 (file)
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java
+++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/FloatPanel.java
@@ -45,7 +45,7 @@ public class FloatPanel extends MaterialPropertyWidget {
 
         jLabel1.setText(org.openide.util.NbBundle.getMessage(FloatPanel.class, "FloatPanel.jLabel1.text")); // NOI18N
         jLabel1.setMaximumSize(new java.awt.Dimension(100, 16));
-        jLabel1.setPreferredSize(new java.awt.Dimension(100, 0));
+        jLabel1.setPreferredSize(new java.awt.Dimension(100, 16));
         jToolBar1.add(jLabel1);
 
         jPanel1.setBackground(new java.awt.Color(204, 204, 204));
@@ -76,7 +76,7 @@ public class FloatPanel extends MaterialPropertyWidget {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 168, Short.MAX_VALUE)
+            .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 168, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form
index 1091d80..ba961b7 100644 (file)
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form
+++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.form
@@ -51,7 +51,7 @@
               <Dimension value="[100, 16]"/>
             </Property>
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[100, 0]"/>
+              <Dimension value="[100, 16]"/>
             </Property>
           </Properties>
         </Component>
@@ -63,9 +63,6 @@
             <Property name="preferredSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
               <Dimension value="[100, 0]"/>
             </Property>
-            <Property name="size" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
-              <Dimension value="[0, 0]"/>
-            </Property>
           </Properties>
 
           <Layout>

diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java
index 09eb0de..78793bf 100644 (file)
--- a/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java
+++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materials/multiview/widgets/IntPanel.java
@@ -45,12 +45,11 @@ public class IntPanel extends MaterialPropertyWidget {
 
         jLabel1.setText(org.openide.util.NbBundle.getMessage(IntPanel.class, "IntPanel.jLabel1.text")); // NOI18N
         jLabel1.setMaximumSize(new java.awt.Dimension(100, 16));
-        jLabel1.setPreferredSize(new java.awt.Dimension(100, 0));
+        jLabel1.setPreferredSize(new java.awt.Dimension(100, 16));
         jToolBar1.add(jLabel1);
 
         jPanel1.setBackground(new java.awt.Color(204, 204, 204));
         jPanel1.setPreferredSize(new java.awt.Dimension(100, 0));
-        jPanel1.setSize(new java.awt.Dimension(0, 0));
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
@@ -77,7 +76,7 @@ public class IntPanel extends MaterialPropertyWidget {
         this.setLayout(layout);
         layout.setHorizontalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addComponent(jToolBar1, javax.swing.GroupLayout.PREFERRED_SIZE, 129, Short.MAX_VALUE)
+            .addComponent(jToolBar1, javax.swing.GroupLayout.DEFAULT_SIZE, 129, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
             layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)