Revision: 9505
Author: gwt.mirror...@gmail.com
Date: Thu Jan  6 15:16:44 2011
Log: Handle deferred layout updates gracefully in SplitLayoutPanel resize logic.

Review at http://gwt-code-reviews.appspot.com/1262801

http://code.google.com/p/google-web-toolkit/source/detail?r=9505

Modified:
 /trunk/user/src/com/google/gwt/user/client/ui/SplitLayoutPanel.java

=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/SplitLayoutPanel.java Wed Jan 5 10:24:15 2011 +++ /trunk/user/src/com/google/gwt/user/client/ui/SplitLayoutPanel.java Thu Jan 6 12:11:16 2011
@@ -100,6 +100,8 @@
     private final boolean reverse;
     private int minSize;

+    private double centerSize, syncedCenterSize;
+
     public Splitter(Widget target, boolean reverse) {
       this.target = target;
       this.reverse = reverse;
@@ -176,22 +178,36 @@

     protected abstract int getTargetSize();

+    private double getMaxSize() {
+      // To avoid seeing stale center size values due to deferred layout
+      // updates, maintain our own copy up to date and resync when the
+      // DockLayoutPanel value changes.
+      double newCenterSize = getCenterSize();
+      if (syncedCenterSize != newCenterSize) {
+        syncedCenterSize = newCenterSize;
+        centerSize = newCenterSize;
+      }
+
+      return ((LayoutData) target.getLayoutData()).size + centerSize;
+    }
+
     private void setAssociatedWidgetSize(double size) {
       if (size < minSize) {
         size = minSize;
       }
+
+      double maxSize = getMaxSize();
+      if (size > maxSize) {
+        size = maxSize;
+      }

       LayoutData layout = (LayoutData) target.getLayoutData();
       if (size == layout.size) {
         return;
       }

-      // Don't grow beyond remaining space
-      double centerSize = getCenterSize();
-      if (size - layout.size > centerSize) {
-        size = layout.size + centerSize;
-      }
-
+      // Adjust our view until the deferred layout gets scheduled.
+      centerSize += layout.size - size;
       layout.size = size;

       // Defer actually updating the layout, so that if we receive many

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to