Author: abelevich
Date: 2008-01-28 09:52:59 -0500 (Mon, 28 Jan 2008)
New Revision: 5666
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonDown.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonImage.java
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonUp.java
Log:
re-skinning
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonDown.java
===================================================================
---
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonDown.java 2008-01-28
14:52:33 UTC (rev 5665)
+++
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonDown.java 2008-01-28
14:52:59 UTC (rev 5666)
@@ -41,12 +41,30 @@
}
protected void paint(ResourceContext context, Graphics2D g2d) {
- Integer color = (Integer) restoreData(context);
+ Color[] color = (Color []) restoreData(context);
+ Color triangleColor = color[0];
+ Color borderColor = color[1];
+
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setColor(new Color(color.intValue()));
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL,
RenderingHints.VALUE_STROKE_NORMALIZE);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_DISABLE);
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
+
+ g2d.setColor(triangleColor);
g2d.drawLine(5,2,9,2);
g2d.drawLine(6,3,8,3);
g2d.drawLine(7,4,7,4);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(5, 1, 9, 1);
+ g2d.drawLine(10, 2, 7, 5);
+ g2d.drawLine(7, 5, 4, 2);
+
+
}
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonImage.java
===================================================================
---
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonImage.java 2008-01-28
14:52:33 UTC (rev 5665)
+++
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonImage.java 2008-01-28
14:52:59 UTC (rev 5666)
@@ -21,6 +21,7 @@
package org.richfaces.renderkit.html.images;
+import java.awt.Color;
import java.util.Date;
import javax.faces.context.FacesContext;
@@ -44,24 +45,37 @@
if (objectArray == null) {
return null;
}
-
- return new Integer(new Zipper2(objectArray).nextIntColor());
+ Zipper2 zipper = new Zipper2(objectArray);
+ return new Color[] {zipper.nextColor(), zipper.nextColor()};
}
protected Object getDataToStore(FacesContext context, Object data) {
Skin skin = SkinFactory.getInstance().getSkin(context);
+ byte[] ret = new byte[6];
+ Zipper2 zipper = new Zipper2(ret);
- String skinParameter = "headerTextColor";
- String headerTextColor = (String) skin.getParameter(context, skinParameter);
- if (null == headerTextColor || "".equals(headerTextColor)) {
+ String skinParameterTextColor = "generalTextColor";
+ String generalTextColor = (String) skin.getParameter(context, skinParameterTextColor);
+ if (null == generalTextColor || "".equals(generalTextColor)) {
Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
- headerTextColor = (String) defaultSkin.getParameter(context, skinParameter);
+ generalTextColor = (String) defaultSkin.getParameter(context,
skinParameterTextColor);
}
+
+ Integer color = HtmlColor.decode( generalTextColor == null ?
"#000000":generalTextColor ).getRGB();
+
+ zipper.addColor(color);
- int intValue = HtmlColor.decode( headerTextColor == null ?
"#000000":headerTextColor ).getRGB();
- byte[] ret = new byte[3];
- new Zipper2(ret).addColor(intValue);
+ String skinParameterBackgroundColor = "controlBackgroundColor";
+ String generalBackgroundColor = (String) skin.getParameter(context,
skinParameterBackgroundColor);
+ if (null == generalBackgroundColor || "".equals(generalBackgroundColor)) {
+ Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context);
+ generalBackgroundColor = (String) defaultSkin.getParameter(context,
skinParameterBackgroundColor);
+ }
+
+ color = HtmlColor.decode( generalTextColor == null ?
"#FFFFFF":generalBackgroundColor ).getRGB();
+ zipper.addColor(color);
+
return ret;
}
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonUp.java
===================================================================
---
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonUp.java 2008-01-28
14:52:33 UTC (rev 5665)
+++
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/SpinnerButtonUp.java 2008-01-28
14:52:59 UTC (rev 5666)
@@ -41,14 +41,31 @@
}
protected void paint(ResourceContext context, Graphics2D g2d) {
- Integer color = (Integer) restoreData(context);
- g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_ON);
- g2d.setColor(new Color(color.intValue()));
+
+ Color [] data = (Color []) restoreData(context);
+ Color textColor = data[0];
+ Color borderColor = data[1];
+
+ g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING,
RenderingHints.VALUE_ANTIALIAS_OFF);
+ g2d.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL,
RenderingHints.VALUE_STROKE_NORMALIZE);
+ g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING,
RenderingHints.VALUE_COLOR_RENDER_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_DITHERING,
RenderingHints.VALUE_DITHER_DISABLE);
+ g2d.setRenderingHint(RenderingHints.KEY_ALPHA_INTERPOLATION,
RenderingHints.VALUE_ALPHA_INTERPOLATION_QUALITY);
+ g2d.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ g2d.setRenderingHint(RenderingHints.KEY_RENDERING,
RenderingHints.VALUE_RENDER_QUALITY);
+
+ g2d.setColor(textColor);
g2d.drawLine(5,5,9,5);
g2d.drawLine(6,4,8,4);
g2d.drawLine(7,3,7,3);
+
+ g2d.setColor(borderColor);
+ g2d.drawLine(5, 6, 9, 6);
+ g2d.drawLine(10, 5, 7, 2);
+ g2d.drawLine(7, 2, 4, 5);
+
}
-
+
+}
-}