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 050a34f80fad3d05afaeefdc3762cd6147cb41a2..cb766441d36ccc9236fda192990505c2160c2a6d 100644 (file)
--- 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 = " ";
                                }
 
                                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 10b0dc0232cc9e0477a0e92c75d97be2b8aa2ceb..b2a22c51a4f94211fa493599036fe9e778b7c087 100644 (file)
--- 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{\r
        background: transparent url(../common/img/ajax-loader.gif) no-repeat;\r
        display: block;\r
-       padding-left: 20px;\r
-       margin-left: -20px;\r
+       margin-left:-10px;\r
+       padding-left:10px;\r
+       margin-top:-12px;\r
+       padding-top:12px;\r
 }\r
 \r
 \r