From 22eb633dcb50ea7ce302cdf4a0af127e44bf36f6 Mon Sep 17 00:00:00 2001
From: Marc Englund <marc.englund@itmill.com>
Date: Wed, 18 Jan 2012 14:06:23 +0000
Subject: [PATCH] Merged patch found in #7111 from 6.7,  also for #5095 #5096
 #6996

svn changeset:22691/svn branch:6.8
---
 WebContent/VAADIN/themes/base/tabsheet/tabsheet.css         | 6 +++++-
 .../themes/chameleon/components/tabsheet/tabsheet.css       | 1 -
 .../VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css   | 1 -
 src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java        | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
index 6fae7381a1..0cae436002 100644
--- a/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/base/tabsheet/tabsheet.css
@@ -95,7 +95,11 @@
 	padding: 0.2em 0.5em;
 }
 .v-tabsheet-tabitem .v-caption {
-	cursor: pointer;
+	cursor: inherit;
+}
+.v-tabsheet.v-disabled .v-tabsheet-tabitem,
+.v-tabsheet-tabitemcell-disabled .v-tabsheet-tabitem {
+	cursor: default;
 }
 .v-tabsheet-tabitem-selected {
 	cursor: default;
diff --git a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
index 1c52c27576..4ca7359094 100644
--- a/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
+++ b/WebContent/VAADIN/themes/chameleon/components/tabsheet/tabsheet.css
@@ -105,7 +105,6 @@
 	width: 16px;
 	height: 14px;
 	overflow: hidden;
-	cursor: default;
 	opacity: .5;
 	filter: alpha(opacity=50);
 	}
diff --git a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
index 217676558e..18ad5c9194 100644
--- a/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
+++ b/WebContent/VAADIN/themes/reindeer/tabsheet/tabsheet-scroller.css
@@ -24,7 +24,6 @@
 	width: 18px;
 	height: 17px;
 	overflow: hidden;
-	cursor: default;
 }
 .v-tabsheet-scroller button::-moz-focus-inner {
 	border: none;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
index 6c912fec19..d30d999d16 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTabsheet.java
@@ -52,7 +52,7 @@ public class VTabsheet extends VTabsheetBase {
 
     /**
      * Representation of a single "tab" shown in the TabBar
-     * 
+     *
      */
     private static class Tab extends SimplePanel {
         private static final String TD_CLASSNAME = CLASSNAME + "-tabitemcell";
@@ -62,6 +62,8 @@ public class VTabsheet extends VTabsheetBase {
                 + "-selected";
         private static final String TD_SELECTED_FIRST_CLASSNAME = TD_SELECTED_CLASSNAME
                 + "-first";
+        private static final String TD_DISABLED_CLASSNAME = TD_CLASSNAME
+                + "-disabled";
 
         private static final String DIV_CLASSNAME = CLASSNAME + "-tabitem";
         private static final String DIV_SELECTED_CLASSNAME = DIV_CLASSNAME
@@ -114,6 +116,7 @@ public class VTabsheet extends VTabsheetBase {
 
         public void setEnabledOnServer(boolean enabled) {
             enabledOnServer = enabled;
+            setStyleName(td, TD_DISABLED_CLASSNAME, !enabled);
         }
 
         public void addClickHandler(ClickHandler handler) {
-- 
2.39.5