diff options
| -rw-r--r-- | client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java | 9 | ||||
| m--------- | tests/screenshots | 0 |
2 files changed, 7 insertions, 2 deletions
diff --git a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java index 6749d14b10..31d419b802 100644 --- a/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java +++ b/client/src/main/java/com/vaadin/client/ui/gridlayout/GridLayoutConnector.java @@ -76,13 +76,18 @@ public class GridLayoutConnector extends AbstractComponentContainerConnector private static native void registerFontLoadedCallback() /*-{ try { - if ($doc.fonts && $doc.fonts.status == 'loading') { + if (!$doc.fonts) { + // perform delayed forced refresh + setTimeout(function() { + $wnd.vaadin.forceLayout(); + }, 300); + } else if ($doc.fonts.status == 'loading') { $doc.fonts.ready.then(function () { $wnd.vaadin.forceLayout(); }); } } catch(err) { - // fonts ready promise not supported by the browser + // just rely on the normal rendering being close to correct } }-*/; diff --git a/tests/screenshots b/tests/screenshots -Subproject 37f67cd836df7d34469f55298bb167696338f2a +Subproject 3d42ae5894c1be9823c7dbc7caeeb226c0afdf7 |