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

integrated change described in this thread to the ColorRGBAPropertyEditor

Browse Source 
http://hub.jmonkeyengine.org/t/colorrgbapropertyeditor-a-little-improvement/31552
This commit is contained in:
Nehon 2015-02-10 00:24:35 +01:00
parent 4cb007f3b3
commit ac7d8d0674
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk/jme3-core/src/com/jme3/gde/core/properties/ColorRGBADialog.java
View File

@ -53,6 +53,7 @@ public class ColorRGBADialog extends javax.swing.JDialog {
super(parent, modal); super(parent, modal);
this.editor = editor; this.editor = editor;
initComponents(); initComponents();
jColorChooser1.setColor(new Color(((ColorRGBA)editor.getValue()).asIntARGB()));
alphaSlider.setValue(Math.round(((ColorRGBA)editor.getValue()).getAlpha()*100)); alphaSlider.setValue(Math.round(((ColorRGBA)editor.getValue()).getAlpha()*100));
} }

18
sdk/jme3-core/src/com/jme3/gde/core/properties/ColorRGBAPropertyEditor.java
View File

@ -52,7 +52,11 @@ public class ColorRGBAPropertyEditor implements PropertyEditor {
public void setValue(Object value) { public void setValue(Object value) {
if (value instanceof ColorRGBA) { if (value instanceof ColorRGBA) {
color.set((ColorRGBA) value); if (color == null) {
color = new ColorRGBA((ColorRGBA) value);
} else {
color.set((ColorRGBA) value);
}
} }
} }
@ -61,11 +65,19 @@ public class ColorRGBAPropertyEditor implements PropertyEditor {
} }
public boolean isPaintable() { public boolean isPaintable() {
return false; return true;
} }
public void paintValue(Graphics gfx, Rectangle box) { public void paintValue(Graphics gfx, Rectangle box) {
throw new UnsupportedOperationException("Not supported yet."); final int width = box.height - 2;
final int height = box.height - 2;
java.awt.Color oldColor = gfx.getColor();
gfx.setColor(java.awt.Color.BLACK);
gfx.drawRect(box.x, box.y + 1, width, height);
gfx.setColor(new java.awt.Color(color.asIntARGB(), true));
gfx.fillRect(box.x + 1, box.y + 2, width - 1, height - 1);
gfx.setColor(oldColor);
gfx.drawString(getAsText(), box.x + width + 5, box.y + (box.height / 2) + 4);
} }
public String getJavaInitializationString() { public String getJavaInitializationString() {