From: Jouni Koivuviita <jouni.koivuviita@itmill.com>
Date: Tue, 3 Feb 2009 13:47:35 +0000 (+0000)
Subject: Fixes #2534: PopupView stylename doesn't affect the actual popup element.
X-Git-Tag: 6.7.0.beta1~3232
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=eab634502d762f39f8b5f05879d171552a7203af;p=vaadin-framework.git

Fixes #2534: PopupView stylename doesn't affect the actual popup element.

svn changeset:6713/svn branch:trunk
---

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 efca0e114d..21ce91d424 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupView.java
@@ -103,6 +103,22 @@ public class IPopupView extends HTML implements Container {
             // showPopupOnTop(popup, hostReference);
             preparePopup(popup);
             popup.updateFromUIDL(popupUIDL, client);
+            if (uidl.hasAttribute("style")) {
+                final String[] styles = uidl.getStringAttribute("style").split(
+                        " ");
+                final StringBuffer styleBuf = new StringBuffer();
+                final String primaryName = popup.getStylePrimaryName();
+                styleBuf.append(primaryName);
+                for (int i = 0; i < styles.length; i++) {
+                    styleBuf.append(" ");
+                    styleBuf.append(primaryName);
+                    styleBuf.append("-");
+                    styleBuf.append(styles[i]);
+                }
+                popup.setStyleName(styleBuf.toString());
+            } else {
+                popup.setStyleName(popup.getStylePrimaryName());
+            }
             showPopup(popup);
 
             // The popup shouldn't be visible, try to hide it.
@@ -323,6 +339,7 @@ public class IPopupView extends HTML implements Container {
             hiding = false;
         }
 
+        @Override
         public Element getContainerElement() {
             return super.getContainerElement();
         }