Author: maksimkaszynski Date: 2007-09-10 09:53:36 -0400 (Mon, 10 Sep 2007) New Revision: 2835 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java Log: http://jira.jboss.com/jira/browse/RF-870 Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2007-09-10 13:39:11 UTC (rev 2834) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/CalendarIcon.java 2007-09-10 13:53:36 UTC (rev 2835) @@ -90,8 +90,6 @@ return null; } - byte[] ret = new byte[6]; - Zipper2 zipper2 = new Zipper2(ret).addColor(HtmlColor.decode(headerTextColor).getRGB()); skinParameter = "selectControlColor"; String headerBackgroundColor = (String) skin.getParameter(context, skinParameter); @@ -102,6 +100,8 @@ return null; } + byte[] ret = new byte[6]; + Zipper2 zipper2 = new Zipper2(ret).addColor(HtmlColor.decode(headerTextColor).getRGB()); zipper2.addColor(HtmlColor.decode(headerBackgroundColor).getRGB()); return ret; @@ -121,83 +121,11 @@ } public void paint(ResourceContext context, Graphics2D graphics) { + Object[] stored = (Object[]) restoreData(context); - if (stored != null) { - Dimension dim = getDimensions(context); - BufferedImage image = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); - - Graphics2D g2d = image.createGraphics(); - - Color borderColor = (Color) stored[0];//new Color(((Integer) stored[0]).intValue()); - Color activeColor = (Color) stored[1];//new Color(((Integer) stored[1]).intValue()); - - - g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); - - g2d.setStroke(new BasicStroke(1)); - - int w = 16; - int h = 16; - - - //Draw Border - g2d.setColor(borderColor); - Rectangle2D border = new Rectangle2D.Double(1, 1, w - 3, h - 3); - RoundRectangle2D round = new RoundRectangle2D.Double(1, 1, w- 3, h - 3, 2, 2); - g2d.draw(round); - - Color lightBlue = new Color(216, 226, 240); - Paint gradient1 = new GradientPaint(w-4, h-4, lightBlue, 2, 2, Color.white); - g2d.setPaint(gradient1); - border = new Rectangle2D.Double(2, 2, w - 4, h - 4); - g2d.fill(border); - - border = new Rectangle2D.Double(3, 3, w - 6, h - 6); - gradient1 = new GradientPaint(3, 3, lightBlue , w - 6, h - 6, borderColor); - g2d.setPaint(gradient1); - g2d.fill(border); - - g2d.setColor(Color.white); - g2d.drawLine(3, 6, 3, 11); - g2d.drawLine(5, 6, 5, 11); - g2d.drawLine(7, 6, 7, 11); - g2d.drawLine(9, 6, 9, 11); - g2d.drawLine(11, 6, 11, 11); - - - - - - //Draw orange rectangle - border = new Rectangle2D.Double(3, 3, 10, 3); - g2d.setColor(Color.white); - g2d.fill(border); - - Color c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 100); - Color c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); - - gradient1 = new GradientPaint(12, 4, activeColor, 4, 7, c2); - g2d.setPaint(gradient1); - g2d.fill(border); - //g2d.setColor(activeColor); - - c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 150); - c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); - border = new Rectangle2D.Double(4, 4, 8, 1); - - g2d.setColor(Color.white); - g2d.fill(border); - - gradient1 = new GradientPaint(4, 4, c, 10, 4, c2); - //g2d.setPaint(gradient1); - g2d.setColor(c); - g2d.fill(border); - - g2d.dispose(); - + BufferedImage image = paintImage(stored); graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); graphics.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BICUBIC); graphics.drawImage(image, 0, 0, dim.width, dim.height, null); @@ -206,4 +134,80 @@ } + protected BufferedImage paintImage(Object [] colors) { + + BufferedImage image = new BufferedImage(16, 16, BufferedImage.TYPE_INT_ARGB); + + Graphics2D g2d = image.createGraphics(); + + Color borderColor = (Color) colors[0];//new Color(((Integer) stored[0]).intValue()); + Color activeColor = (Color) colors[1];//new Color(((Integer) stored[1]).intValue()); + + + g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g2d.setRenderingHint(RenderingHints.KEY_COLOR_RENDERING, RenderingHints.VALUE_COLOR_RENDER_QUALITY); + + g2d.setStroke(new BasicStroke(1)); + + int w = 16; + int h = 16; + + + //Draw Border + g2d.setColor(borderColor); + Rectangle2D border = new Rectangle2D.Double(1, 1, w - 3, h - 3); + RoundRectangle2D round = new RoundRectangle2D.Double(1, 1, w- 3, h - 3, 2, 2); + g2d.draw(round); + + Color lightBlue = new Color(216, 226, 240); + Paint gradient1 = new GradientPaint(w-4, h-4, lightBlue, 2, 2, Color.white); + g2d.setPaint(gradient1); + border = new Rectangle2D.Double(2, 2, w - 4, h - 4); + g2d.fill(border); + + border = new Rectangle2D.Double(3, 3, w - 6, h - 6); + gradient1 = new GradientPaint(3, 3, lightBlue , w - 6, h - 6, borderColor); + g2d.setPaint(gradient1); + g2d.fill(border); + + g2d.setColor(Color.white); + g2d.drawLine(3, 6, 3, 11); + g2d.drawLine(5, 6, 5, 11); + g2d.drawLine(7, 6, 7, 11); + g2d.drawLine(9, 6, 9, 11); + g2d.drawLine(11, 6, 11, 11); + + + + + + //Draw orange rectangle + border = new Rectangle2D.Double(3, 3, 10, 3); + g2d.setColor(Color.white); + g2d.fill(border); + + Color c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 100); + Color c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); + + gradient1 = new GradientPaint(12, 4, activeColor, 4, 7, c2); + g2d.setPaint(gradient1); + g2d.fill(border); + //g2d.setColor(activeColor); + + c = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 150); + c2 = new Color(activeColor.getRed(), activeColor.getGreen(), activeColor.getBlue(), 200); + border = new Rectangle2D.Double(4, 4, 8, 1); + + g2d.setColor(Color.white); + g2d.fill(border); + + gradient1 = new GradientPaint(4, 4, c, 10, 4, c2); + //g2d.setPaint(gradient1); + g2d.setColor(c); + g2d.fill(border); + + g2d.dispose(); + + return image; + } } Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java =================================================================== --- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java 2007-09-10 13:39:11 UTC (rev 2834) +++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/html/iconimages/DisabledCalendarIcon.java 2007-09-10 13:53:36 UTC (rev 2835) @@ -21,13 +21,10 @@ package org.richfaces.renderkit.html.iconimages; -import javax.faces.context.FacesContext; +import java.awt.color.ColorSpace; +import java.awt.image.BufferedImage; +import java.awt.image.ColorConvertOp; -import org.ajax4jsf.util.HtmlColor; -import org.ajax4jsf.util.Zipper2; -import org.richfaces.skin.Skin; -import org.richfaces.skin.SkinFactory; - /** * @author Maksim Kaszynski * @@ -35,36 +32,14 @@ public class DisabledCalendarIcon extends CalendarIcon { /* (non-Javadoc) - * @see org.richfaces.renderkit.html.iconimages.CalendarIcon#getDataToStore(javax.faces.context.FacesContext, java.lang.Object) + * @see org.richfaces.renderkit.html.iconimages.CalendarIcon#paintImage(java.lang.Object[]) */ - protected Object getDataToStore(FacesContext context, Object data) { + protected BufferedImage paintImage(Object[] colors) { - Skin skin = SkinFactory.getInstance().getSkin(context); - Skin defaultSkin = SkinFactory.getInstance().getDefaultSkin(context); + BufferedImage image = super.paintImage(colors); - String skinParameter = "headerBackgroundColor"; - String headerTextColor = (String) skin.getParameter(context, skinParameter); - if (null == headerTextColor || "".equals(headerTextColor)) - headerTextColor = (String) defaultSkin.getParameter(context, skinParameter); + image = new ColorConvertOp(ColorSpace.getInstance(ColorSpace.CS_GRAY), null).filter(image, null); - if (headerTextColor == null) { - return null; - } - - - skinParameter = "tabDisabledTextColor"; - String headerBackgroundColor = (String) skin.getParameter(context, skinParameter); - if (null == headerBackgroundColor || "".equals(headerBackgroundColor)) - headerBackgroundColor = (String) defaultSkin.getParameter(context, skinParameter); - - if(headerBackgroundColor == null){ - return null; - } - - byte[] ret = new byte[6]; - Zipper2 zipper2 = new Zipper2(ret).addColor(HtmlColor.decode(headerTextColor).getRGB()); - zipper2.addColor(HtmlColor.decode(headerBackgroundColor).getRGB()); - - return ret; + return image; } }