diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.form b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.form index faf38b964..3886f62c0 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.form +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.form @@ -96,11 +96,6 @@ - - - - - @@ -121,7 +116,7 @@ - + diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.java index 2a4bb6559..78a8bdf8b 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.java @@ -146,7 +146,6 @@ public final class GenerateLODVisualPanel1 extends JPanel { } }); - reductionDescription.setBackground(new java.awt.Color(240, 240, 240)); jScrollPane1.setViewportView(reductionDescription); javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1); @@ -436,7 +435,7 @@ public final class GenerateLODVisualPanel1 extends JPanel { jPanel2Layout.setHorizontalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addComponent(valuePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) - .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 506, Short.MAX_VALUE) + .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 508, Short.MAX_VALUE) ); jPanel2Layout.setVerticalGroup( jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.form b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.form index a2a88b5eb..bc3570176 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.form +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.form @@ -55,9 +55,6 @@ - - - diff --git a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.java b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.java index a9be7998e..606957597 100644 --- a/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.java +++ b/sdk/jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.java @@ -65,7 +65,6 @@ public final class GenerateTangentsVisualPanel1 extends JPanel { org.openide.awt.Mnemonics.setLocalizedText(splitMirrored, org.openide.util.NbBundle.getMessage(GenerateTangentsVisualPanel1.class, "GenerateTangentsVisualPanel1.splitMirrored.text")); // NOI18N - jTextPane1.setBackground(new java.awt.Color(240, 240, 240)); jTextPane1.setText(org.openide.util.NbBundle.getMessage(GenerateTangentsVisualPanel1.class, "GenerateTangentsVisualPanel1.jTextPane1.text")); // NOI18N jScrollPane1.setViewportView(jTextPane1); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/NodePanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/NodePanel.java index 49f94fe7d..723cbcd91 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/NodePanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/NodePanel.java @@ -312,6 +312,7 @@ public class NodePanel extends DraggablePanel implements Selectable, PropertyCha icon = Icons.frag; } header = new JLabel(icon); + header.setForeground(Color.BLACK); header.addMouseListener(labelMouseMotionListener); header.addMouseMotionListener(labelMouseMotionListener); header.setHorizontalAlignment(SwingConstants.LEFT); @@ -396,6 +397,7 @@ public class NodePanel extends DraggablePanel implements Selectable, PropertyCha public JLabel createLabel(String glslType, String txt, Dot.ParamType type) { JLabel label = new JLabel(txt); + label.setForeground(Color.BLACK); label.setToolTipText(glslType + " " + txt); label.setOpaque(false); //label.setPreferredSize(new Dimension(50, 15)); diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.form b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.form index 79d9bbe40..b498c54af 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.form +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.form @@ -68,7 +68,7 @@ - + @@ -81,9 +81,9 @@ - + - + @@ -99,6 +99,9 @@ + + + @@ -113,9 +116,6 @@ - - - diff --git a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.java b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.java index 44b511583..e9096e3b6 100644 --- a/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.java +++ b/sdk/jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.java @@ -157,15 +157,15 @@ public class ShaderEditPanel extends JPanel { shaderEditorPane.setText(org.openide.util.NbBundle.getMessage(ShaderEditPanel.class, "ShaderEditPanel.shaderEditorPane.text")); // NOI18N jScrollPane1.setViewportView(shaderEditorPane); - header.setBackground(java.awt.SystemColor.activeCaption); + header.setBackground(javax.swing.UIManager.getDefaults().getColor("TabbedPane.focus")); header.setBorder(javax.swing.BorderFactory.createEtchedBorder()); + headerText.setBackground(javax.swing.UIManager.getDefaults().getColor("TabbedPane.focus")); headerText.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N headerText.setHorizontalAlignment(javax.swing.SwingConstants.CENTER); headerText.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materialdefinition/icons/fragment.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(headerText, org.openide.util.NbBundle.getMessage(ShaderEditPanel.class, "ShaderEditPanel.headerText.text")); // NOI18N - closeButton.setBackground(java.awt.SystemColor.activeCaption); closeButton.setFont(new java.awt.Font("Tahoma", 1, 8)); // NOI18N closeButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materialdefinition/icons/out.png"))); // NOI18N org.openide.awt.Mnemonics.setLocalizedText(closeButton, org.openide.util.NbBundle.getMessage(ShaderEditPanel.class, "ShaderEditPanel.closeButton.text")); // NOI18N @@ -182,9 +182,9 @@ public class ShaderEditPanel extends JPanel { headerLayout.setHorizontalGroup( headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING) .addGroup(headerLayout.createSequentialGroup() - .addComponent(headerText, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE) + .addComponent(headerText, javax.swing.GroupLayout.DEFAULT_SIZE, 613, Short.MAX_VALUE) .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED) - .addComponent(closeButton)) + .addComponent(closeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)) ); headerLayout.setVerticalGroup( headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)