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

diff --git a/WebContent/ITMILL/themes/default/caption/caption.css b/WebContent/ITMILL/themes/default/caption/caption.css
index bd143606cb9e7901faa4d5cf9d586515ae91bf36..bec8935bc8e30ad2bf509d3d165b4b103a1a79cf 100644 (file)
--- 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 df9fc479f3e16e06afb5b8f4a5280b1cea734c6e..bba10f41c0a94efe7c05af8a528cd2674729d38b 100644 (file)
--- 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 43a97d5f3f82b9338e6b39d19b855e7b907e5e85..82be37c876d236040b6dcc359f007708627bfe54 100644 (file)
--- 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 596fe25366ae8b6cd02c37948c5d91fb995fe988..52c000998d7bdc6846fcb78d4ed0718d1d65c7fd 100644 (file)
--- 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 d1b43d4fe99facbaf8259f4df4a42e988b1316de..1dd4971cb995c262028b4ec6ea8ce752794c28e2 100644 (file)
--- 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 de5a4f090362c9edddffec8b2bff1ffcb4bd0e9c..3352ed26a7370a4195274d280827ae277df589de 100644 (file)
--- 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 1f0b7bc88ab4d26e9bcd26eb2082f22d5529c90e..8242baf473a5e3a015a8415a4cd6bcc2642cf654 100644 (file)
--- 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));