fixes #6191

svn changeset:16710/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 678f01d79b1fb2d7434af55b0c91c40ddd5099ba..a840ce79cd0895579aafaddf98d0a6c3dff474b7 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -590,13 +590,19 @@ public class VTabsheet extends VTabsheetBase {
         String overflow = style.getProperty("overflow");
         style.setProperty("overflow", "hidden");
         style.setPropertyPx("width", tabsWidth);
-        Style wrapperstyle = tp.getWidget(tp.getVisibleWidget()).getElement()
-                .getParentElement().getStyle();
-        wrapperstyle.setPropertyPx("width", tabsWidth);
+
+        boolean hasTabs = tp.getWidgetCount() > 0;
+
+        Style wrapperstyle = null;
+        if (hasTabs) {
+            wrapperstyle = tp.getWidget(tp.getVisibleWidget()).getElement()
+                    .getParentElement().getStyle();
+            wrapperstyle.setPropertyPx("width", tabsWidth);
+        }
         // Get content width from actual widget
 
         int contentWidth = 0;
-        if (tp.getWidgetCount() > 0) {
+        if (hasTabs) {
             contentWidth = tp.getWidget(tp.getVisibleWidget()).getOffsetWidth();
         }
         style.setProperty("overflow", overflow);
@@ -610,7 +616,9 @@ public class VTabsheet extends VTabsheetBase {
 
         tabs.getStyle().setPropertyPx("width", outerWidth);
         style.setPropertyPx("width", tabsWidth);
-        wrapperstyle.setPropertyPx("width", tabsWidth);
+        if (hasTabs) {
+            wrapperstyle.setPropertyPx("width", tabsWidth);
+        }
 
         contentNode.getStyle().setPropertyPx("width", tabsWidth);
         super.setWidth(outerWidth + "px");