From 73397508dbcf2256ac5199c18be2cf48d4e4cccc Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Wed, 15 Jan 2014 11:14:04 +0200 Subject: Revert "Changed the rendering order of TabSheet tabs to prevent an NPE in isClipped (#12343)" This reverts commit 5b56eeb521fdb92df5434647a8db27f0a45f09b9. --- client/src/com/vaadin/client/ui/VTabsheet.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/client/src/com/vaadin/client/ui/VTabsheet.java b/client/src/com/vaadin/client/ui/VTabsheet.java index b65f058a46..6fd8fc4272 100644 --- a/client/src/com/vaadin/client/ui/VTabsheet.java +++ b/client/src/com/vaadin/client/ui/VTabsheet.java @@ -840,10 +840,6 @@ public class VTabsheet extends VTabsheetBase implements Focusable, if (tab == null) { tab = tb.addTab(); } - if (selected) { - renderContent(tabUidl.getChildUIDL(0)); - tb.selectTab(index); - } tab.updateFromUIDL(tabUidl); tab.setEnabledOnServer((!disabledTabKeys.contains(tabKeys.get(index)))); tab.setHiddenOnServer(hidden); @@ -860,6 +856,11 @@ public class VTabsheet extends VTabsheetBase implements Focusable, * and tabs won't be too narrow in certain browsers */ tab.recalculateCaptionWidth(); + + if (selected) { + renderContent(tabUidl.getChildUIDL(0)); + tb.selectTab(index); + } } /** -- cgit v1.2.3