Fixes #2522: Fix icon alignment in all components

Also one fix for IPopupView: NPE in ApplicationConnection after ComponentDetail etc. refactoring.

svn changeset:6683/svn branch:trunk

7 files changed, 23 insertions, 6 deletions

diff --git a/WebContent/ITMILL/themes/default/caption/caption.css b/WebContent/ITMILL/themes/default/caption/caption.css
index bd143606cb..bec8935bc8 100644
--- a/WebContent/ITMILL/themes/default/caption/caption.css
+++ b/WebContent/ITMILL/themes/default/caption/caption.css
@@ -34,6 +34,7 @@
 .i-caption .i-captiontext {
 	float: left;
 	overflow: hidden;
+	vertical-align: middle;
 }
 
 .i-caption .i-required-field-indicator {
diff --git a/WebContent/ITMILL/themes/default/common/common.css b/WebContent/ITMILL/themes/default/common/common.css
index df9fc479f3..bba10f41c0 100644
--- a/WebContent/ITMILL/themes/default/common/common.css
+++ b/WebContent/ITMILL/themes/default/common/common.css
@@ -90,6 +90,10 @@
 	filter: Alpha(opacity = 30);
 }
 
+.i-disabled * {
+	cursor: pointer;
+}
+
 * html .i-disabled {
 	zoom: 1;
 }
diff --git a/WebContent/ITMILL/themes/default/link/link.css b/WebContent/ITMILL/themes/default/link/link.css
index 43a97d5f3f..82be37c876 100644
--- a/WebContent/ITMILL/themes/default/link/link.css
+++ b/WebContent/ITMILL/themes/default/link/link.css
@@ -12,10 +12,11 @@
 
 .i-link span {
 	text-decoration: underline;
+	vertical-align: middle;
 }
 
 .i-disabled a {
-	cursor: default;
+	cursor: pointer;
 }
 
 .i-link img {
diff --git a/WebContent/ITMILL/themes/default/select/select.css b/WebContent/ITMILL/themes/default/select/select.css
index 596fe25366..52c000998d 100644
--- a/WebContent/ITMILL/themes/default/select/select.css
+++ b/WebContent/ITMILL/themes/default/select/select.css
@@ -152,6 +152,10 @@
 	vertical-align: middle;
 }
 
+.i-filterselect-suggestmenu .gwt-MenuItem span {
+	vertical-align: middle;
+}
+
 .i-filterselect-suggestmenu .gwt-MenuItem-selected {
 	background: #5daee8;
 	color: #fff;
diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index d1b43d4fe9..1dd4971cb9 100644
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -170,6 +170,7 @@
 .i-caption .i-captiontext {
 	float: left;
 	overflow: hidden;
+	vertical-align: middle;
 }
 
 .i-caption .i-required-field-indicator {
@@ -269,6 +270,10 @@
 	filter: Alpha(opacity = 30);
 }
 
+.i-disabled * {
+	cursor: pointer;
+}
+
 * html .i-disabled {
 	zoom: 1;
 }
@@ -844,10 +849,11 @@ input.i-modified,
 
 .i-link span {
 	text-decoration: underline;
+	vertical-align: middle;
 }
 
 .i-disabled a {
-	cursor: default;
+	cursor: pointer;
 }
 
 .i-link img {
@@ -1405,6 +1411,10 @@ input.i-modified,
 	vertical-align: middle;
 }
 
+.i-filterselect-suggestmenu .gwt-MenuItem span {
+	vertical-align: middle;
+}
+
 .i-filterselect-suggestmenu .gwt-MenuItem-selected {
 	background: #5daee8;
 	color: #fff;
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index de5a4f0903..3352ed26a7 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -65,7 +65,7 @@ public class IFilterSelect extends Composite implements Paintable, Field,
                 sb.append(iconUri);
                 sb.append("\" alt=\"\" class=\"i-icon\" />");
             }
-            sb.append(Util.escapeHTML(caption));
+            sb.append("<span>" + Util.escapeHTML(caption) + "</span>");
             return sb.toString();
         }
 
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
index 1f0b7bc88a..8242baf473 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
@@ -295,9 +295,6 @@ public class IPopupView extends HTML implements Paintable {
         }
 
         public void updateFromUIDL(UIDL uidl, ApplicationConnection client) {
-            if (client.updateComponent(this, uidl, false)) {
-                return;
-            }
 
             Paintable newPopupComponent = client.getPaintable(uidl
                     .getChildUIDL(0));