diff options
| author | Artur Signell <artur.signell@itmill.com> | 2008-12-18 10:05:37 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2008-12-18 10:05:37 +0000 |
| commit | 3058750c7652c229d0beeaf562bc9d4658b62c33 (patch) | |
| tree | c5bea9edda46b76b9262e298a493528f6dfb12fb /src/com/itmill/toolkit/ui/AbstractComponent.java | |
| parent | 1e17126b8dd1bf09bc0b0e3728a9f2cf8c5ac949 (diff) | |
| download | vaadin-framework-3058750c7652c229d0beeaf562bc9d4658b62c33.tar.gz vaadin-framework-3058750c7652c229d0beeaf562bc9d4658b62c33.zip | |
Refactored layout size checking method, related to #2139
svn changeset:6264/svn branch:trunk
Diffstat (limited to 'src/com/itmill/toolkit/ui/AbstractComponent.java')
| -rw-r--r-- | src/com/itmill/toolkit/ui/AbstractComponent.java | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/com/itmill/toolkit/ui/AbstractComponent.java b/src/com/itmill/toolkit/ui/AbstractComponent.java index 94e194d351..0d7f40d5b2 100644 --- a/src/com/itmill/toolkit/ui/AbstractComponent.java +++ b/src/com/itmill/toolkit/ui/AbstractComponent.java @@ -22,7 +22,7 @@ import com.itmill.toolkit.terminal.PaintException; import com.itmill.toolkit.terminal.PaintTarget; import com.itmill.toolkit.terminal.Resource; import com.itmill.toolkit.terminal.Terminal; -import com.itmill.toolkit.terminal.gwt.server.DebugUtilities; +import com.itmill.toolkit.terminal.gwt.server.ComponentSizeValidator; /** * An abstract class that defines default implementation for the @@ -135,6 +135,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource * Constructs a new Component. */ public AbstractComponent() { + // ComponentSizeValidator.setCreationLocation(this); } /* Get/Set component properties */ @@ -610,14 +611,14 @@ public abstract class AbstractComponent implements Component, MethodEventSource // Only paint content of visible components. if (isVisible()) { if (getHeight() >= 0 - && (getHeightUnits() != UNITS_PERCENTAGE || !DebugUtilities - .parentCannotDefineHeight(this))) { + && (getHeightUnits() != UNITS_PERCENTAGE || ComponentSizeValidator + .parentCanDefineHeight(this))) { target.addAttribute("height", "" + getCSSHeight()); } if (getWidth() >= 0 - && (getWidthUnits() != UNITS_PERCENTAGE || !DebugUtilities - .parentCannotDefineWidth(this))) { + && (getWidthUnits() != UNITS_PERCENTAGE || ComponentSizeValidator + .parentCanDefineWidth(this))) { target.addAttribute("width", "" + getCSSWidth()); } if (styles != null && styles.size() > 0) { @@ -1107,6 +1108,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource this.height = height; heightUnit = unit; requestRepaint(); + // ComponentSizeValidator.setHeightLocation(this); } /* @@ -1158,6 +1160,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource this.width = width; widthUnit = unit; requestRepaint(); + // ComponentSizeValidator.setWidthLocation(this); } /* |