7:10 a.m.
Author: abelevich
Date: 2011-01-31 07:10:01 -0500 (Mon, 31 Jan 2011)
New Revision: 21316
Added:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
Log:
RF-10102 AutoComplete: create design markup and icons/images for disabled mode
Added:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java
(rev 0)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboButtonBase.java 2011-01-31
12:10:01 UTC (rev 21316)
@@ -0,0 +1,77 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.resource.AbstractJava2DUserResource;
+import org.richfaces.resource.DynamicUserResource;
+import org.richfaces.resource.StateHolderResource;
+
+@DynamicUserResource
+public abstract class ComboButtonBase extends AbstractJava2DUserResource implements
StateHolderResource {
+
+ private static final Dimension DIMENSION = new Dimension(15, 15);
+
+ protected Integer arrowColor;
+
+ public ComboButtonBase() {
+ super(DIMENSION);
+ }
+
+ public boolean isTransient() {
+ return false;
+ }
+
+ public void writeState(FacesContext context, DataOutput dataOutput) throws
IOException {
+ dataOutput.writeInt(this.arrowColor);
+ }
+
+ public void readState(FacesContext context, DataInput dataInput) throws IOException
{
+ this.arrowColor = dataInput.readInt();
+ }
+
+ public void paint(Graphics2D graphics2d) {
+ graphics2d.setColor(Color.WHITE);
+ graphics2d.drawLine(4, 5, 10, 5);
+ graphics2d.drawLine(3, 6, 11, 6);
+ graphics2d.drawLine(4, 7, 10, 7);
+ graphics2d.drawLine(5, 8, 9, 8);
+ graphics2d.drawLine(6, 9, 8, 9);
+ graphics2d.drawLine(7, 10, 7, 10);
+
+ Color arrowColor = new Color(this.arrowColor);
+ graphics2d.setColor(arrowColor);
+ graphics2d.drawLine(4, 6, 10, 6);
+ graphics2d.drawLine(5, 7, 9, 7);
+ graphics2d.drawLine(6, 8, 8, 8);
+ graphics2d.drawLine(7, 9, 7, 9);
+ }
+}
Added:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java
(rev 0)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDisabledDownButton.java 2011-01-31
12:10:01 UTC (rev 21316)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.resource.PostConstructResource;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+public class ComboDisabledDownButton extends ComboButtonBase {
+
+ @PostConstructResource
+ public final void initialize() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ Skin skin = SkinFactory.getInstance(context).getSkin(context);
+
+ this.arrowColor = skin.getColorParameter(context, Skin.TABLE_BORDER_COLOR);
+ }
+}
Added:
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java
===================================================================
---
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java
(rev 0)
+++
trunk/ui/input/ui/src/main/java/org/richfaces/renderkit/html/images/ComboDownButton.java 2011-01-31
12:10:01 UTC (rev 21316)
@@ -0,0 +1,40 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.renderkit.html.images;
+
+import javax.faces.context.FacesContext;
+
+import org.richfaces.resource.PostConstructResource;
+import org.richfaces.skin.Skin;
+import org.richfaces.skin.SkinFactory;
+
+public class ComboDownButton extends ComboButtonBase {
+
+ @PostConstructResource
+ public final void initialize() {
+ FacesContext context = FacesContext.getCurrentInstance();
+ Skin skin = SkinFactory.getInstance(context).getSkin(context);
+
+ this.arrowColor = skin.getColorParameter(context, Skin.GENERAL_TEXT_COLOR);
+ }
+}
Modified:
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
===================================================================
---
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-31
11:35:34 UTC (rev 21315)
+++
trunk/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-01-31
12:10:01 UTC (rev 21316)
@@ -54,11 +54,19 @@
.rf-au-btn-arrow{
background-position: center;
background-repeat: no-repeat;
- background-image:
"url(#{resource['org.richfaces:combo_down_button.gif']})";
+ background-image:
"url(#{resource['org.richfaces.renderkit.html.images.ComboDownButton']})";
width: 15px;
height: 15px;
}
+.rf-au-btn-arrow-dis{
+ background-position: center;
+ background-repeat: no-repeat;
+ background-image:
"url(#{resource['org.richfaces.renderkit.html.images.ComboDisabledDownButton']})";
+ width: 15px;
+ height: 15px;
+}
+
.rf-au-lst-cord{
position: absolute;
z-index: 10000;
Modified: trunk/ui/input/ui/src/main/templates/autocomplete.template.xml
===================================================================
--- trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-31 11:35:34 UTC
(rev 21315)
+++ trunk/ui/input/ui/src/main/templates/autocomplete.template.xml 2011-01-31 12:10:01 UTC
(rev 21316)
@@ -31,7 +31,7 @@
<c:if
test="#{component.attributes['showButton']}">
<c:if
test="#{component.attributes['disabled']}">
<div id="#{clientId}Button" class="rf-au-btn
rf-au-btn-dis">
- <div class="rf-au-btn-arrow"></div>
+ <div class="rf-au-btn-arrow-dis"></div>
</div>
</c:if>
<c:if
test="#{!component.attributes['disabled']}">