From: Mathieu Baudier Date: Sun, 7 Feb 2021 16:38:50 +0000 (+0100) Subject: Merge remote-tracking branch 'origin/master' into v2.x X-Git-Tag: argeo-commons-2.1.101~2 X-Git-Url: https://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=73cf412e0f59e37e78395b72e67166d9f65ac145;hp=5b3fde2e47cfa0edb507ff0829c9346efad48d14 Merge remote-tracking branch 'origin/master' into v2.x --- diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java index 48ac9a0c9..51c0ab4f5 100644 --- a/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java +++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/widgets/auth/CmsLogin.java @@ -220,7 +220,7 @@ public class CmsLogin implements CmsStyles, CallbackHandler { child.dispose(); createContents(parent); if (parent.getParent() != null) - parent.getParent().layout(); + parent.getParent().layout(true, true); else parent.layout(); usernameT.setText(usernameStr);