From f07b87404748fbf2544663a4f8958cb0d781f5d2 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 10 Nov 2008 12:32:55 +0000 Subject: [PATCH] OrderedLayout cleanup svn changeset:5843/svn branch:trunk --- .../terminal/gwt/client/ui/IOrderedLayout.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java index ba961e436e..ca9b6ae4da 100644 --- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java +++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IOrderedLayout.java @@ -33,8 +33,6 @@ public class IOrderedLayout extends CellBasedLayout { private boolean isRendering = false; - private String width = null; - @Override public void setStyleName(String styleName) { super.setStyleName(styleName); @@ -56,7 +54,6 @@ public class IOrderedLayout extends CellBasedLayout { public IOrderedLayout() { setStyleName(CLASSNAME); - // DOM.setStyleAttribute(getElement(), "overflow", "hidden"); } @Override @@ -66,6 +63,7 @@ public class IOrderedLayout extends CellBasedLayout { // Only non-cached UIDL:s can introduce changes if (uidl.getBooleanAttribute("cached")) { + isRendering = false; return; } @@ -230,18 +228,6 @@ public class IOrderedLayout extends CellBasedLayout { } - private static boolean hasRelativeSize(FloatSize relativeSize, - int orientation) { - if (relativeSize == null) { - return false; - } - if (orientation == ORIENTATION_HORIZONTAL) { - return relativeSize.getWidth() >= 0; - } else { - return relativeSize.getHeight() >= 0; - } - } - private void handleOrientationUpdate(UIDL uidl) { int newOrientation = ORIENTATION_VERTICAL; if ("horizontal".equals(uidl.getStringAttribute("orientation"))) { @@ -658,7 +644,6 @@ public class IOrderedLayout extends CellBasedLayout { @Override public void setWidth(String width) { super.setWidth(width); - this.width = width; if (width != null && !width.equals("")) { activeLayoutSize.setWidth(getOffsetWidth() -- 2.39.5