Author: vmolotkov Date: 2008-01-09 12:09:30 -0500 (Wed, 09 Jan 2008) New Revision: 5232 Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx Log: component corrected Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 16:57:40 UTC (rev 5231) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-09 17:09:30 UTC (rev 5232) @@ -43,7 +43,8 @@ } .rich-cb-list-scroll { - overflow : auto; + overflow-y : auto; + overflow-x : hidden; } .rich-cb-list-cord { @@ -115,7 +116,6 @@ background : center no-repeat; cursor : pointer; } - ]]> </f:verbatim> @@ -162,6 +162,12 @@ <u:style name="font-size" skin="headerSizeFont"/> </u:selector> + <u:selector name=".rich-cb-font-disabled"> + <u:style name="color" skin="tabDisabledTextColor"/> + <u:style name="font-family" skin="headerFamilyFont"/> + <u:style name="font-size" skin="headerSizeFont"/> + </u:selector> + <u:selector name=".rich-cb-field"> <u:style name="background-image"> <f:resource f:key="org.richfaces.renderkit.images.ComboBoxInputGradient" /> Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js =================================================================== --- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 16:57:40 UTC (rev 5231) +++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-09 17:09:30 UTC (rev 5232) @@ -208,8 +208,10 @@ this.listParent.style.visibility = "hidden"; this.listParent.show(); - Richfaces.ComboBoxList.LAYOUT_BORDER = Richfaces.getBorderWidth(this.listParent, "tb"); - Richfaces.ComboBoxList.LAYOUT_PADDING = Richfaces.getPaddingWidth(this.listParent, "tb"); + Richfaces.ComboBoxList.LAYOUT_BORDER_V = Richfaces.getBorderWidth(this.listParent, "tb"); + Richfaces.ComboBoxList.LAYOUT_BORDER_H = Richfaces.getBorderWidth(this.listParent, "lr"); + Richfaces.ComboBoxList.LAYOUT_PADDING_V = Richfaces.getPaddingWidth(this.listParent, "tb"); + Richfaces.ComboBoxList.LAYOUT_PADDING_H = Richfaces.getPaddingWidth(this.listParent, "lr"); this.listParent.hide(); this.listParent.style.visibility = "visible"; @@ -268,7 +270,7 @@ currentItemsHeight = itemHeight * rowsAmount; } - if (this.height && (this.height < currentItemsHeight)) { + if (this.height && (parseInt(this.height) < currentItemsHeight)) { if (this.height < currentItemsHeight) { height = currentItemsHeight; } @@ -281,12 +283,17 @@ } if (Prototype.Browser.IE) { - height += Richfaces.ComboBoxList.LAYOUT_BORDER - Richfaces.ComboBoxList.LAYOUT_PADDING; + height = parseInt(height) + Richfaces.ComboBoxList.LAYOUT_BORDER_V + Richfaces.ComboBoxList.LAYOUT_PADDING_V; } this.listParent.style.height = height; if (this.width) { - this.listParent.style.width = this.width + var width = this.width; + if (Prototype.Browser.Gecko) { + width = parseInt(this.width) - Richfaces.ComboBoxList.LAYOUT_BORDER_H - Richfaces.ComboBoxList.LAYOUT_PADDING_H; + } + this.listParent.style.width = width; + this.list.style.width = width; } }, Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx =================================================================== --- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 16:57:40 UTC (rev 5231) +++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-09 17:09:30 UTC (rev 5232) @@ -62,7 +62,7 @@ </input> <input type="text" class="rich-cb-strut rich-cb-font" style="width:#{listWidth}"> </input> - <div id="listParent#{clientId}" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position" style="display:none"> + <div id="listParent#{clientId}" style="display:none;" class="rich-cb-list-cord rich-cb-list-scroll rich-cb-list-decoration rich-cb-list-position"> <div id="list#{clientId}"> <f:call name="encodeItems"/> </div>