Read debug window settings when all entry points have run (#17882)

Change-Id: I09d612d784f978ba483d243b6938697893e1eac4

1 files changed, 25 insertions, 13 deletions

diff --git a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
index b543c23e4d..fbc838f861 100644
--- a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
+++ b/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Date;
 
 import com.google.gwt.core.client.Duration;
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
@@ -698,22 +700,32 @@ public final class VDebugWindow extends VOverlay {
     public void init() {
 
         show();
-        readStoredState();
 
-        Window.addResizeHandler(new com.google.gwt.event.logical.shared.ResizeHandler() {
+        /*
+         * Finalize initialization when all entry points have had the chance to
+         * e.g. register new sections.
+         */
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
+            @Override
+            public void execute() {
+                readStoredState();
 
-            Timer t = new Timer() {
-                @Override
-                public void run() {
-                    applyPositionAndSize();
-                }
-            };
+                Window.addResizeHandler(new com.google.gwt.event.logical.shared.ResizeHandler() {
 
-            @Override
-            public void onResize(ResizeEvent event) {
-                t.cancel();
-                // TODO less
-                t.schedule(1000);
+                    Timer t = new Timer() {
+                        @Override
+                        public void run() {
+                            applyPositionAndSize();
+                        }
+                    };
+
+                    @Override
+                    public void onResize(ResizeEvent event) {
+                        t.cancel();
+                        // TODO less
+                        t.schedule(1000);
+                    }
+                });
             }
         });
     }