[richfaces-svn-commits] JBoss Rich Faces SVN: r13990 - trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images.
Author: nbelaevski
Date: 2009-05-03 07:51:44 -0400 (Sun, 03 May 2009)
New Revision: 13990
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
Log:
BaseControlBackgroundImage fixed
Modified:
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java
===================================================================
---
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-05-03
10:59:52 UTC (rev 13989)
+++
trunk/framework/impl/src/main/java/org/richfaces/renderkit/html/images/BaseControlBackgroundImage.java 2009-05-03
11:51:44 UTC (rev 13990)
@@ -25,6 +25,7 @@
import javax.faces.context.FacesContext;
+import org.ajax4jsf.resource.ResourceContext;
import org.ajax4jsf.util.HtmlDimensions;
import org.ajax4jsf.util.Zipper2;
import org.richfaces.renderkit.html.BaseGradient;
@@ -48,12 +49,22 @@
public Dimension getDimensions(FacesContext facesContext, Object data) {
Data data2 = (Data) data;
- if (data != null) {
+ if (data != null) {
return new Dimension(super.getDimensions(facesContext, data).width,
data2.getHeight());
} else {
return DIMENSION;
}
}
+
+ @Override
+ protected Dimension getDimensions(ResourceContext resourceContext) {
+ Data data = (Data) restoreData(resourceContext);
+ if (data != null) {
+ return new Dimension(super.getDimensions(resourceContext).width,
data.getHeight());
+ } else {
+ return DIMENSION;
+ }
+ }
protected final Integer getHeight(FacesContext context, String heightParamName) {
SkinFactory skinFactory = SkinFactory.getInstance();