Author: nbelaevski Date: 2007-05-29 19:04:02 -0400 (Tue, 29 May 2007) New Revision: 942 Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java Log: http://jira.jboss.com/jira/browse/RF-242 fixed Modified: trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java =================================================================== --- trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-05-29 17:54:00 UTC (rev 941) +++ trunk/richfaces/menu-components/src/main/java/org/richfaces/renderkit/html/images/MenuNodeImage.java 2007-05-29 23:04:02 UTC (rev 942) @@ -19,7 +19,7 @@ public class MenuNodeImage extends Java2Dresource { - private static final Dimension dimensions = new Dimension(7, 14); + private static final Dimension dimensions = new Dimension(16, 32); protected Dimension getDimensions(ResourceContext resourceContext) { return dimensions; @@ -58,17 +58,22 @@ MenuNodeImageData mnd = (MenuNodeImageData) restoreData(context); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + int x0 = 6; + int y0 = 8; + g2d.setColor(new Color(mnd.getGeneralColor().intValue())); - g2d.drawLine(2,0,2,6); - g2d.drawLine(3,1,3,5); - g2d.drawLine(4,2,4,4); - g2d.drawLine(5,3,5,3); + g2d.drawLine(x0, y0 - 3, x0, y0 +3); + g2d.drawLine(x0 + 1, y0 - 2, x0 + 1, y0 + 2); + g2d.drawLine(x0 + 2, y0 - 1, x0 + 2, y0 + 1); + g2d.drawLine(x0 + 3, y0, x0 + 3, y0); + int y1 = 24; + g2d.setColor(new Color(mnd.getDisabledColor().intValue())); - g2d.drawLine(2,7,2,13); - g2d.drawLine(3,8,3,12); - g2d.drawLine(4,9,4,11); - g2d.drawLine(5,10,5,10); + g2d.drawLine(x0, y1 - 3, x0, y1 +3); + g2d.drawLine(x0 + 1, y1 - 2, x0 + 1, y1 + 2); + g2d.drawLine(x0 + 2, y1 - 1, x0 + 2, y1 + 1); + g2d.drawLine(x0 + 3, y1, x0 + 3, y1); } Modified: trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss =================================================================== --- trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-29 17:54:00 UTC (rev 941) +++ trunk/richfaces/menu-components/src/main/resources/org/richfaces/renderkit/html/css/menucomponents.xcss 2007-05-29 23:04:02 UTC (rev 942) @@ -40,18 +40,14 @@ .dr-menu-node { position : absolute; - width : 7px; - height : 7px; + width : 16px; + height : 16px; font-size : 1px; - right : 0px; + top : 1px; + right : 1px; } -.dr-menu-node-icon { - top : 7px; - right : 6px; -} - -.dr-menu-item-disabled .dr-menu-node-icon { +.dr-menu-item-disabled .dr-menu-node { background-position : bottom; } ]]> Modified: trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx =================================================================== --- trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-05-29 17:54:00 UTC (rev 941) +++ trunk/richfaces/menu-components/src/main/templates/org/richfaces/htmlMenuGroup.jspx 2007-05-29 23:04:02 UTC (rev 942) @@ -24,7 +24,7 @@ <div id="ref#{clientId}" - class="dr-menu-item #{menuGroupClass} rich-menu-group #{component.attributes['styleClass']}" + class="dr-menu-item #{menuGroupClass} rich-menu-group #{component.attributes['styleClass']}" style="#{component.attributes['style']}" onmousemove="#{menuGroupMouseMove}"> @@ -33,15 +33,12 @@ <jsp:scriptlet> <![CDATA[ boolean disabled = ((Boolean) component.getAttributes().get("disabled")).booleanValue(); - String iconFacet = disabled ? "iconDisabled" : "icon"; - ComponentsVariableResolver.getVariables(this, component).setVariable("iconFacet", iconFacet); - if(component.getFacet(iconFacet)!=null && component.getFacet(iconFacet).isRendered()) { - ]]> + String iconName = disabled ? "iconDisabled" : "icon"; + UIComponent iconFacet = component.getFacet(iconName); + if (iconFacet !=null && iconFacet.isRendered()) { + renderChild(context, iconFacet); + } else if (component.getAttributes().get(iconName)!=null) {]]> </jsp:scriptlet> - <u:insertFacet name="#{iconFacet}" /> - <jsp:scriptlet> - <![CDATA[} else if (component.getAttributes().get(iconFacet)!=null) {]]> - </jsp:scriptlet> <img width="16" height="16" style="#{component.attributes['iconStyle']}" src="#{actualIcon}"/> @@ -61,11 +58,16 @@ <jsp:scriptlet> <![CDATA[ String iconFolder = disabled ? "iconFolderDisabled" : "iconFolder"; - ComponentsVariableResolver.getVariables(this, component).setVariable("iconFolder", iconFolder); - if(component.getFacet(iconFolder)!=null && component.getFacet(iconFolder).isRendered()) { + UIComponent iconFolderFacet = component.getFacet(iconFolder); + if (iconFolderFacet != null && iconFolderFacet.isRendered()) { ]]> </jsp:scriptlet> <div id="ref#{clientId}:folder" class="dr-menu-node #{menuGroupItemFolderClass}"> + <jsp:scriptlet> + <![CDATA[ + renderChild(context, iconFolderFacet); + ]]> + </jsp:scriptlet> <u:insertFacet name="#{iconFolder}" /> </div> <jsp:scriptlet> Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java =================================================================== --- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-05-29 17:54:00 UTC (rev 941) +++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuGroupComponentTest.java 2007-05-29 23:04:02 UTC (rev 942) @@ -193,7 +193,7 @@ assertEquals("div", div.getNodeName()); classAttr = div.getAttributeValue("class"); assertTrue(classAttr - .contains("dr-menu-item dr-menu-item-disabled rich-menu-group rich-menu-group-disabled")); + .contains("dr-menu-item dr-menu-item-disabled rich-menu-group-disabled rich-menu-group")); } Modified: trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java =================================================================== --- trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-05-29 17:54:00 UTC (rev 941) +++ trunk/richfaces/menu-components/src/test/java/org/richfaces/component/MenuItemComponentTest.java 2007-05-29 23:04:02 UTC (rev 942) @@ -157,7 +157,7 @@ // System.out.println(page.asXml()); HtmlElement span = page.getHtmlElementById(menuItem .getClientId(facesContext) - + ":disabled"); + + ":anchor"); assertNotNull(span); assertEquals("span", span.getNodeName()); String classAttr = span.getAttributeValue("class");