You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2010/11/18 17:47:11 UTC
svn commit: r1036526 [2/2] - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/l...
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/PanelRenderer.java Thu Nov 18 16:47:10 2010
@@ -22,6 +22,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.UIReload;
import org.apache.myfaces.tobago.context.TobagoFacesContext;
import org.apache.myfaces.tobago.internal.component.AbstractUIPanel;
+import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
import org.apache.myfaces.tobago.renderkit.css.Position;
@@ -104,11 +105,45 @@ public class PanelRenderer extends Layou
HtmlRendererUtils.writeScriptLoader(facesContext, null, cmds);
}
HtmlRendererUtils.checkForCommandFacet(panel, facesContext, writer);
+
+ final Measure borderLeft = panel.getBorderLeft();
+ final Measure borderRight = panel.getBorderRight();
+ final Measure borderTop = panel.getBorderTop();
+ final Measure borderBottom = panel.getBorderBottom();
+
+ if (borderLeft.greaterThan(Measure.ZERO) || borderRight.greaterThan(Measure.ZERO)
+ || borderTop.greaterThan(Measure.ZERO) || borderBottom.greaterThan(Measure.ZERO)) {
+ writer.startElement(HtmlElements.DIV, panel);
+ writer.writeClassAttribute(Classes.create(panel, "content")); // needed to be scrollable inside of the panel
+ final Style inner = new Style(facesContext, panel);
+ // Todo: FIXME (be null may occur in sheets)
+ if (inner.getWidth() != null) {
+ inner.setWidth(inner.getWidth().subtract(borderLeft).subtract(borderRight));
+ }
+ // Todo: FIXME (be null may occur in sheets)
+ if (inner.getHeight() != null) {
+ inner.setHeight(inner.getHeight().subtract(borderTop).subtract(borderBottom));
+ }
+ inner.setLeft(borderLeft);
+ inner.setTop(borderTop);
+ writer.writeStyleAttribute(inner);
+ }
}
@Override
- public void encodeEnd(FacesContext facesContext, UIComponent uiComponent) throws IOException {
+ public void encodeEnd(FacesContext facesContext, UIComponent component) throws IOException {
ResponseWriter writer = facesContext.getResponseWriter();
+ AbstractUIPanel panel = (AbstractUIPanel) component;
+
+ final Measure borderLeft = panel.getBorderLeft();
+ final Measure borderRight = panel.getBorderRight();
+ final Measure borderTop = panel.getBorderTop();
+ final Measure borderBottom = panel.getBorderBottom();
+
+ if (borderLeft.greaterThan(Measure.ZERO) || borderRight.greaterThan(Measure.ZERO)
+ || borderTop.greaterThan(Measure.ZERO) || borderBottom.greaterThan(Measure.ZERO)) {
+ writer.endElement(HtmlElements.DIV);
+ }
writer.endElement(HtmlElements.DIV);
}
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Thu Nov 18 16:47:10 2010
@@ -995,7 +995,7 @@ public class SheetRenderer extends Layou
}
private Measure getContentBorder(FacesContext facesContext, UISheet data) {
- return getOffsetLeft(facesContext, data).add(getOffsetRight(facesContext, data));
+ return getBorderLeft(facesContext, data).add(getBorderRight(facesContext, data));
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/property/tobago-theme-config.properties Thu Nov 18 16:47:10 2010
@@ -37,10 +37,10 @@ Box.paddingHeight=31
Box.headerHeight=0
Box.paddingTopWhenToolbar=22
Box.extraPaddingHeightWhenToolbar=10
-Box.offsetLeft=0
-Box.offsetTop=0
-Box.offsetRight=0
-Box.offsetBottom=0
+Box.borderLeft=0
+Box.borderTop=0
+Box.borderRight=0
+Box.borderBottom=0
Button.fontWidth=8
Button.imageWidth=18
@@ -159,20 +159,20 @@ Sheet.rowHeight=18
Sheet.rowPadding=5
Sheet.selectorMenuWidth=20
Sheet.cellPaddingWidth=4
-Sheet.offsetLeft=0
-Sheet.offsetTop=0
-Sheet.offsetRight=0
-Sheet.offsetBottom=0
+Sheet.borderLeft=0
+Sheet.borderTop=0
+Sheet.borderRight=0
+Sheet.borderBottom=0
Sheet.verticalScrollbarWeight=17
Sheet.horizontalScrollbarWeight=17
Tab.paddingWidth=0
Tab.paddingHeight=0
Tab.headerHeight=0
-Tab.offsetLeft=5
-Tab.offsetTop=29
-Tab.offsetRight=5
-Tab.offsetBottom=5
+Tab.borderLeft=5
+Tab.borderTop=29
+Tab.borderRight=5
+Tab.borderBottom=5
TabGroup.fontWidth=8
TabGroup.paddingWidth=24
@@ -181,10 +181,10 @@ TabGroup.headerHeight=24
TabGroup.tabLabelExtraWidth=20
TabGroup.toolBarWidth=48
TabGroup.toolBarExtra=2
-TabGroup.offsetLeft=1
-TabGroup.offsetTop=0
-TabGroup.offsetRight=2
-TabGroup.offsetBottom=2
+TabGroup.borderLeft=1
+TabGroup.borderTop=0
+TabGroup.borderRight=2
+TabGroup.borderBottom=2
Textarea.headerHeight=0
Textarea.minimumHeight=36
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/style.css Thu Nov 18 16:47:10 2010
@@ -553,6 +553,18 @@ iframe.tobago-menu-ie6bugfix {
position: absolute;
}
+/* panel -------------------------------------------------------------- */
+
+.tobago-panel {
+ overflow-x: hidden;
+ overflow-y: hidden;
+}
+
+.tobago-panel-content {
+ overflow-x: auto;
+ overflow-y: auto;
+}
+
/* popup -------------------------------------------------------------- */
.tobago-popup-shield {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Thu Nov 18 16:47:10 2010
@@ -145,14 +145,14 @@ without shadow
writer.startElement(HtmlElements.DIV, null);
writer.writeClassAttribute(Classes.create(box, "content")); // needed to be scrollable inside of the box
final Style style = new Style(facesContext, box);
- final Measure offsetLeft = getOffsetLeft(facesContext, box);
- final Measure offsetRight = getOffsetRight(facesContext, box);
- final Measure offsetTop = getOffsetTop(facesContext, box);
- final Measure offsetBottom = getOffsetBottom(facesContext, box);
- style.setWidth(style.getWidth().subtract(offsetLeft).subtract(offsetRight));
- style.setHeight(style.getHeight().subtract(offsetTop).subtract(offsetBottom));
- style.setLeft(offsetLeft);
- style.setTop(offsetTop);
+ final Measure borderLeft = box.getBorderLeft();
+ final Measure borderRight = box.getBorderRight();
+ final Measure borderTop = box.getBorderTop();
+ final Measure borderBottom = box.getBorderBottom();
+ style.setWidth(style.getWidth().subtract(borderLeft).subtract(borderRight));
+ style.setHeight(style.getHeight().subtract(borderTop).subtract(borderBottom));
+ style.setLeft(borderLeft);
+ style.setTop(borderTop);
writer.writeStyleAttribute(style);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Thu Nov 18 16:47:10 2010
@@ -29,11 +29,15 @@ Box.paddingHeight=12
Box.paddingWidth=13
Box.componentExtraWidth=0
Box.componentExtraHeight=0
-Box.offsetLeft=1
-Box.offsetTop=21
-Box.offsetRight=2
-Box.offsetBottom=2
-# activates the shadow
+Box.borderLeft=1
+Box.borderTop=21
+Box.borderRight=2
+Box.borderBottom=2
+Box.paddingLeft=5
+Box.paddingTop=5
+Box.paddingRight=5
+Box.paddingBottom=5
+# shadow=1 activates the shadow
Box.shadow=1
Button.preferredHeight=20
@@ -94,15 +98,15 @@ Sheet.footerHeight=15
Sheet.rowPadding=3
Sheet.selectorMenuWidth=16
Sheet.cellPaddingWidth=4
-Sheet.offsetLeft=1
-Sheet.offsetRight=1
+Sheet.borderLeft=1
+Sheet.borderRight=1
Tab.paddingWidth=0
Tab.paddingHeight=0
-Tab.offsetLeft=0
-Tab.offsetTop=0
-Tab.offsetRight=0
-Tab.offsetBottom=0
+Tab.borderLeft=0
+Tab.borderTop=0
+Tab.borderRight=0
+Tab.borderBottom=0
TabGroup.paddingHeight=22
TabGroup.paddingWidth=23
@@ -110,10 +114,10 @@ TabGroup.headerHeight=19
TabGroup.tabLabelExtraWidth=20
TabGroup.toolBarWidth=48
TabGroup.toolBarExtra=2
-TabGroup.offsetLeft=1
-TabGroup.offsetTop=19
-TabGroup.offsetRight=2
-TabGroup.offsetBottom=2
+TabGroup.borderLeft=1
+TabGroup.borderTop=19
+TabGroup.borderRight=2
+TabGroup.borderBottom=2
Textarea.minimumHeight=33
Textarea.css.border-left-width=1
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/BoxRendererBase.java Thu Nov 18 16:47:10 2010
@@ -38,19 +38,19 @@ public abstract class BoxRendererBase ex
}
@Override
- public Measure getOffsetTop(FacesContext facesContext, Configurable component) {
+ public Measure getBorderTop(FacesContext facesContext, Configurable component) {
- Measure offsetTop = super.getOffsetTop(facesContext, component);
+ Measure borderTop = super.getBorderTop(facesContext, component);
if (getMenuBarFacet((UIComponent) component) != null) {
- offsetTop = offsetTop.add(19); // todo: get via theme config
+ borderTop = borderTop.add(19); // todo: get via theme config
}
- return offsetTop;
+ return borderTop;
}
@Override
public Measure getMinimumHeight(FacesContext facesContext, Configurable component) {
if (component instanceof UIBox && ((UIBox) component).isCollapsed()) {
- return getOffsetTop(facesContext, component);
+ return getBorderTop(facesContext, component);
}
return super.getMinimumHeight(facesContext, component);
}
@@ -58,7 +58,7 @@ public abstract class BoxRendererBase ex
@Override
public Measure getMaximumHeight(FacesContext facesContext, Configurable component) {
if (component instanceof UIBox && ((UIBox) component).isCollapsed()) {
- return getOffsetTop(facesContext, component);
+ return getBorderTop(facesContext, component);
}
return super.getMaximumHeight(facesContext, component);
}
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties?rev=1036526&r1=1036525&r2=1036526&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/property/tobago-theme-config.properties Thu Nov 18 16:47:10 2010
@@ -18,15 +18,15 @@
# theme: standard
# agent: standard
-Box.marginLeft=5
+Box.marginLeft=50
Box.marginRight=5
Box.marginTop=5
Box.marginBottom=5
-Cell.offsetLeft=0
-Cell.offsetTop=0
-Cell.offsetRight=0
-Cell.offsetBottom=0
+Cell.borderLeft=0
+Cell.borderTop=0
+Cell.borderRight=0
+Cell.borderBottom=0
Cell.css.border-left-width=0
Cell.css.border-top-width=0
Cell.css.border-right-width=0
@@ -53,22 +53,22 @@ Label.css.padding-bottom=0
Messages.preferredHeight=20
Messages.height=20
-Page.offsetLeft=0
-Page.offsetTop=0
-Page.offsetRight=0
-Page.offsetBottom=0
+Page.borderLeft=0
+Page.borderTop=0
+Page.borderRight=0
+Page.borderBottom=0
Page.width=1024
Page.height=768
-Panel.offsetLeft=0
-Panel.offsetTop=0
-Panel.offsetRight=0
-Panel.offsetBottom=0
-
-Popup.offsetLeft=0
-Popup.offsetTop=0
-Popup.offsetRight=0
-Popup.offsetBottom=0
+Panel.borderLeft=0
+Panel.borderTop=0
+Panel.borderRight=0
+Panel.borderBottom=0
+
+Popup.borderLeft=0
+Popup.borderTop=0
+Popup.borderRight=0
+Popup.borderBottom=0
Separator.css.border-left-width=0
Separator.css.border-top-width=0