From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Mon, 10 Dec 2007 13:26:46 +0000 (+0000)
Subject: -Loading throbbers should now be cleared after updates (all three timers).
X-Git-Tag: 6.7.0.beta1~5259
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b0b716020eef363c05cc732952eb11bb85708b24;p=vaadin-framework.git

-Loading throbbers should now be cleared after updates (all three timers).
-ITwinColSelect won't wrap elements anymore.
-ITree won't wrap it's texts anymore.

svn changeset:3202/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
index 923dbab3d6..0ca9967421 100755
--- a/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java
@@ -52,6 +52,8 @@ public class ApplicationConnection {
     private ContextMenu contextMenu = null;
 
     private Timer loadTimer;
+    private Timer loadTimer2;
+    private Timer loadTimer3;
     private Element loadElement;
 
     private final IView view;
@@ -161,23 +163,23 @@ public class ApplicationConnection {
                                 + "px");
 
                 // Initialize other timers
-                final Timer delay = new Timer() {
+                loadTimer2 = new Timer() {
                     public void run() {
                         DOM.setElementProperty(loadElement, "className",
                                 "i-loading-indicator-delay");
                     }
                 };
                 // Second one kicks in at 1500ms
-                delay.schedule(1200);
+                loadTimer2.schedule(1200);
 
-                final Timer wait = new Timer() {
+                loadTimer3 = new Timer() {
                     public void run() {
                         DOM.setElementProperty(loadElement, "className",
                                 "i-loading-indicator-wait");
                     }
                 };
                 // Third one kicks in at 5000ms
-                wait.schedule(4700);
+                loadTimer3.schedule(4700);
             }
         };
         // First one kicks in at 300ms
@@ -187,6 +189,10 @@ public class ApplicationConnection {
     private void hideLoadingIndicator() {
         if (loadTimer != null) {
             loadTimer.cancel();
+            if(loadTimer2 != null) {
+                loadTimer2.cancel();
+                loadTimer3.cancel();
+            }
         }
         if (loadElement != null) {
             DOM.setStyleAttribute(loadElement, "display", "none");
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
index 31ec923f16..de4165719f 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ITwinColSelect.java
@@ -19,8 +19,8 @@ public class ITwinColSelect extends IOptionGroupBase {
     private static final String CLASSNAME = "i-select-twincol";
 
     private static final int VISIBLE_COUNT = 10;
-
-    private static final String DEFAULT_WIDTH = "10em";
+    
+    private static final int DEFAULT_COLUMN_COUNT = 10;
 
     private final ListBox options;
 
@@ -83,9 +83,11 @@ public class ITwinColSelect extends IOptionGroupBase {
         if (getColumns() > 0) {
             options.setWidth(getColumns() + "em");
             selections.setWidth(getColumns() + "em");
+            optionsContainer.setWidth((getColumns()*2 + 3) + "em");
         } else {
-            options.setWidth(DEFAULT_WIDTH);
-            selections.setWidth(DEFAULT_WIDTH);
+            options.setWidth(DEFAULT_COLUMN_COUNT + "em");
+            selections.setWidth(DEFAULT_COLUMN_COUNT + "em");
+            optionsContainer.setWidth((DEFAULT_COLUMN_COUNT*2 + 2) + "em");
         }
         if (getRows() > 0) {
             options.setVisibleItemCount(getRows());
diff --git a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css
index c3382b7ffe..f627e082c3 100644
--- a/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css
+++ b/src/com/itmill/toolkit/terminal/gwt/public/default/tree/tree.css
@@ -13,6 +13,7 @@
 .i-tree-node span {
 	padding: 0 2px;
 	cursor: pointer;
+	white-space: nowrap;
 }
 .i-tree-node-selected span {
 	background: #5daee8;