Browse Source

More fixes to panels color so that it uses the one from the LAF

Nehon 10 years ago
parent
commit
dab5a0b3a9

+ 1 - 6
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateLODVisualPanel1.form

@@ -96,11 +96,6 @@
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
           <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
           <SubComponents>
           <SubComponents>
             <Component class="javax.swing.JTextPane" name="reductionDescription">
             <Component class="javax.swing.JTextPane" name="reductionDescription">
-              <Properties>
-                <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-                  <Color blue="f0" green="f0" red="f0" type="rgb"/>
-                </Property>
-              </Properties>
             </Component>
             </Component>
           </SubComponents>
           </SubComponents>
         </Container>
         </Container>
@@ -121,7 +116,7 @@
         <DimensionLayout dim="0">
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Component id="valuePanel" max="32767" attributes="0"/>
               <Component id="valuePanel" max="32767" attributes="0"/>
-              <Component id="jLabel1" alignment="0" pref="506" max="32767" attributes="0"/>
+              <Component id="jLabel1" alignment="0" pref="508" max="32767" attributes="0"/>
           </Group>
           </Group>
         </DimensionLayout>
         </DimensionLayout>
         <DimensionLayout dim="1">
         <DimensionLayout dim="1">

+ 1 - 2
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);
         jScrollPane1.setViewportView(reductionDescription);
 
 
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
         javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
@@ -436,7 +435,7 @@ public final class GenerateLODVisualPanel1 extends JPanel {
         jPanel2Layout.setHorizontalGroup(
         jPanel2Layout.setHorizontalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addComponent(valuePanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
             .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.setVerticalGroup(
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

+ 0 - 3
jme3-core/src/com/jme3/gde/core/sceneexplorer/nodes/actions/impl/GenerateTangentsVisualPanel1.form

@@ -55,9 +55,6 @@
       <SubComponents>
       <SubComponents>
         <Component class="javax.swing.JTextPane" name="jTextPane1">
         <Component class="javax.swing.JTextPane" name="jTextPane1">
           <Properties>
           <Properties>
-            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="f0" green="f0" red="f0" type="rgb"/>
-            </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
               <ResourceString bundle="com/jme3/gde/core/sceneexplorer/nodes/actions/impl/Bundle.properties" key="GenerateTangentsVisualPanel1.jTextPane1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
               <ResourceString bundle="com/jme3/gde/core/sceneexplorer/nodes/actions/impl/Bundle.properties" key="GenerateTangentsVisualPanel1.jTextPane1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
             </Property>
             </Property>

+ 0 - 1
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
         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
         jTextPane1.setText(org.openide.util.NbBundle.getMessage(GenerateTangentsVisualPanel1.class, "GenerateTangentsVisualPanel1.jTextPane1.text")); // NOI18N
         jScrollPane1.setViewportView(jTextPane1);
         jScrollPane1.setViewportView(jTextPane1);
 
 

+ 2 - 0
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;
             icon = Icons.frag;
         }
         }
         header = new JLabel(icon);
         header = new JLabel(icon);
+        header.setForeground(Color.BLACK);
         header.addMouseListener(labelMouseMotionListener);
         header.addMouseListener(labelMouseMotionListener);
         header.addMouseMotionListener(labelMouseMotionListener);
         header.addMouseMotionListener(labelMouseMotionListener);
         header.setHorizontalAlignment(SwingConstants.LEFT);
         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) {
     public JLabel createLabel(String glslType, String txt, Dot.ParamType type) {
         JLabel label = new JLabel(txt);
         JLabel label = new JLabel(txt);
+        label.setForeground(Color.BLACK);
         label.setToolTipText(glslType + " " + txt);
         label.setToolTipText(glslType + " " + txt);
         label.setOpaque(false);
         label.setOpaque(false);
         //label.setPreferredSize(new Dimension(50, 15));        
         //label.setPreferredSize(new Dimension(50, 15));        

+ 6 - 6
jme3-materialeditor/src/com/jme3/gde/materialdefinition/editor/ShaderEditPanel.form

@@ -68,7 +68,7 @@
     <Container class="javax.swing.JPanel" name="header">
     <Container class="javax.swing.JPanel" name="header">
       <Properties>
       <Properties>
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
         <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-          <Color blue="d1" green="b4" id="Active Caption" palette="2" red="99" type="palette"/>
+          <Color blue="66" green="66" id="TabbedPane.focus" palette="3" red="66" type="palette"/>
         </Property>
         </Property>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
           <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
@@ -81,9 +81,9 @@
         <DimensionLayout dim="0">
         <DimensionLayout dim="0">
           <Group type="103" groupAlignment="0" attributes="0">
           <Group type="103" groupAlignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
               <Group type="102" alignment="0" attributes="0">
-                  <Component id="headerText" max="32767" attributes="0"/>
+                  <Component id="headerText" pref="613" max="32767" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
                   <EmptySpace max="-2" attributes="0"/>
-                  <Component id="closeButton" min="-2" max="-2" attributes="0"/>
+                  <Component id="closeButton" min="-2" pref="16" max="-2" attributes="0"/>
               </Group>
               </Group>
           </Group>
           </Group>
         </DimensionLayout>
         </DimensionLayout>
@@ -99,6 +99,9 @@
       <SubComponents>
       <SubComponents>
         <Component class="javax.swing.JLabel" name="headerText">
         <Component class="javax.swing.JLabel" name="headerText">
           <Properties>
           <Properties>
+            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
+              <Color blue="66" green="66" id="TabbedPane.focus" palette="3" red="66" type="palette"/>
+            </Property>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Tahoma" size="11" style="1"/>
               <Font name="Tahoma" size="11" style="1"/>
             </Property>
             </Property>
@@ -113,9 +116,6 @@
         </Component>
         </Component>
         <Component class="javax.swing.JButton" name="closeButton">
         <Component class="javax.swing.JButton" name="closeButton">
           <Properties>
           <Properties>
-            <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
-              <Color blue="d1" green="b4" id="Active Caption" palette="2" red="99" type="palette"/>
-            </Property>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
             <Property name="font" type="java.awt.Font" editor="org.netbeans.beaninfo.editors.FontEditor">
               <Font name="Tahoma" size="8" style="1"/>
               <Font name="Tahoma" size="8" style="1"/>
             </Property>
             </Property>

+ 4 - 4
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
         shaderEditorPane.setText(org.openide.util.NbBundle.getMessage(ShaderEditPanel.class, "ShaderEditPanel.shaderEditorPane.text")); // NOI18N
         jScrollPane1.setViewportView(shaderEditorPane);
         jScrollPane1.setViewportView(shaderEditorPane);
 
 
-        header.setBackground(java.awt.SystemColor.activeCaption);
+        header.setBackground(javax.swing.UIManager.getDefaults().getColor("TabbedPane.focus"));
         header.setBorder(javax.swing.BorderFactory.createEtchedBorder());
         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.setFont(new java.awt.Font("Tahoma", 1, 11)); // NOI18N
         headerText.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         headerText.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         headerText.setIcon(new javax.swing.ImageIcon(getClass().getResource("/com/jme3/gde/materialdefinition/icons/fragment.png"))); // NOI18N
         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
         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.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
         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
         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.setHorizontalGroup(
             headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             .addGroup(headerLayout.createSequentialGroup()
             .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)
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addComponent(closeButton))
+                .addComponent(closeButton, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE))
         );
         );
         headerLayout.setVerticalGroup(
         headerLayout.setVerticalGroup(
             headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
             headerLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)