From: Marc Englund <marc.englund@itmill.com>
Date: Thu, 1 Nov 2007 15:31:55 +0000 (+0000)
Subject: Fixes #1060 (loading indicator badly placed).
X-Git-Tag: 6.7.0.beta1~5718
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7b5e6bba9936979d50aef76bd28ab38f427b9019;p=vaadin-framework.git

Fixes #1060 (loading indicator badly placed).
Re-fixes #1055 (clean tab content immediately when changing).

svn changeset:2660/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
index 050a34f80f..cb766441d3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITabsheet.java
@@ -45,7 +45,8 @@ public class ITabsheet extends FlowPanel implements Paintable,
 			if (ITabsheet.this.client != null
 					&& ITabsheet.this.activeTabIndex != tabIndex) {
 				addStyleDependentName("loading");
-				ITabsheet.this.tp.clear();
+				ITabsheet.this.tp.getWidget(
+						ITabsheet.this.tp.getVisibleWidget()).setVisible(false);
 				DeferredCommand.addCommand(new Command() {
 					public void execute() {
 						ITabsheet.this.client.updateVariable(ITabsheet.this.id,
@@ -157,7 +158,7 @@ public class ITabsheet extends FlowPanel implements Paintable,
 				String key = tab.getStringAttribute("key");
 				String caption = tab.getStringAttribute("caption");
 				if (caption == null) {
-					caption = "";
+					caption = "&nbsp;";
 				}
 
 				this.captions.add(caption);
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css
index 10b0dc0232..b2a22c51a4 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tabsheet/tabsheet.css
@@ -112,8 +112,10 @@
 .i-tabsheet-loading .i-tabsheet-tabs .gwt-TabBarItem-selected span{
 	background: transparent url(../common/img/ajax-loader.gif) no-repeat;
 	display: block;
-	padding-left: 20px;
-	margin-left: -20px;
+	margin-left:-10px;
+	padding-left:10px;
+	margin-top:-12px;
+	padding-top:12px;
 }