From 083923c80f7b343b035d60e2df1b2f68dc214233 Mon Sep 17 00:00:00 2001
From: Jouni Koivuviita <jouni@vaadin.com>
Date: Mon, 9 Jun 2014 13:22:25 +0300
Subject: Notification position should be controllable with CSS (#13990)

Change-Id: Ic04f97d00745c2b7d1b4c143b2a458ab47188fd2
---
 client/src/com/vaadin/client/ui/VNotification.java | 72 +++++++++++++++-------
 1 file changed, 49 insertions(+), 23 deletions(-)

(limited to 'client')

diff --git a/client/src/com/vaadin/client/ui/VNotification.java b/client/src/com/vaadin/client/ui/VNotification.java
index 48a3ba6df4..855da517f9 100644
--- a/client/src/com/vaadin/client/ui/VNotification.java
+++ b/client/src/com/vaadin/client/ui/VNotification.java
@@ -22,8 +22,7 @@ import java.util.Iterator;
 
 import com.google.gwt.aria.client.Roles;
 import com.google.gwt.core.client.GWT;
-import com.google.gwt.dom.client.Style;
-import com.google.gwt.dom.client.Style.Unit;
+import com.google.gwt.dom.client.Element;
 import com.google.gwt.event.dom.client.KeyCodes;
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Event;
@@ -53,6 +52,14 @@ public class VNotification extends VOverlay {
     public static final Position BOTTOM_LEFT = Position.BOTTOM_LEFT;
     public static final Position BOTTOM_RIGHT = Position.BOTTOM_RIGHT;
 
+    private static final String STYLENAME_POSITION_TOP = "v-position-top";
+    private static final String STYLENAME_POSITION_RIGHT = "v-position-right";
+    private static final String STYLENAME_POSITION_BOTTOM = "v-position-bottom";
+    private static final String STYLENAME_POSITION_LEFT = "v-position-left";
+    private static final String STYLENAME_POSITION_MIDDLE = "v-position-middle";
+    private static final String STYLENAME_POSITION_CENTER = "v-position-center";
+    private static final String STYLENAME_POSITION_ASSISTIVE = "v-position-assistive";
+
     /**
      * Position that is only accessible for assistive devices, invisible for
      * visual users.
@@ -263,49 +270,68 @@ public class VNotification extends VOverlay {
     }
 
     public void setPosition(com.vaadin.shared.Position position) {
-        final Style style = getElement().getStyle();
-        style.clearTop();
-        style.clearRight();
-        style.clearBottom();
-        style.clearLeft();
+        final Element el = getElement();
+
+        // Remove all offsets (GWT PopupPanel defaults)
+        el.getStyle().clearTop();
+        el.getStyle().clearLeft();
+
+        // Remove any previous positions
+        el.removeClassName(STYLENAME_POSITION_TOP);
+        el.removeClassName(STYLENAME_POSITION_RIGHT);
+        el.removeClassName(STYLENAME_POSITION_BOTTOM);
+        el.removeClassName(STYLENAME_POSITION_LEFT);
+        el.removeClassName(STYLENAME_POSITION_MIDDLE);
+        el.removeClassName(STYLENAME_POSITION_CENTER);
+        el.removeClassName(STYLENAME_POSITION_ASSISTIVE);
+
         switch (position) {
         case TOP_LEFT:
-            style.setTop(0, Unit.PX);
-            style.setLeft(0, Unit.PX);
+            el.addClassName(STYLENAME_POSITION_TOP);
+            el.addClassName(STYLENAME_POSITION_LEFT);
             break;
         case TOP_RIGHT:
-            style.setTop(0, Unit.PX);
-            style.setRight(0, Unit.PX);
+            el.addClassName(STYLENAME_POSITION_TOP);
+            el.addClassName(STYLENAME_POSITION_RIGHT);
             break;
         case MIDDLE_LEFT:
             center();
-            style.setLeft(0, Unit.PX);
+            // Centering sets the left offset
+            el.getStyle().clearLeft();
+            el.addClassName(STYLENAME_POSITION_MIDDLE);
+            el.addClassName(STYLENAME_POSITION_LEFT);
             break;
         case MIDDLE_RIGHT:
             center();
-            style.clearLeft();
-            style.setRight(0, Unit.PX);
+            // Centering sets the left offset
+            el.getStyle().clearLeft();
+            el.addClassName(STYLENAME_POSITION_MIDDLE);
+            el.addClassName(STYLENAME_POSITION_RIGHT);
             break;
         case BOTTOM_RIGHT:
-            style.setBottom(0, Unit.PX);
-            style.setRight(0, Unit.PX);
+            el.addClassName(STYLENAME_POSITION_BOTTOM);
+            el.addClassName(STYLENAME_POSITION_RIGHT);
             break;
         case BOTTOM_LEFT:
-            style.setBottom(0, Unit.PX);
-            style.setLeft(0, Unit.PX);
+            el.addClassName(STYLENAME_POSITION_BOTTOM);
+            el.addClassName(STYLENAME_POSITION_LEFT);
             break;
         case TOP_CENTER:
             center();
-            style.setTop(0, Unit.PX);
+            // Centering sets the top offset
+            el.getStyle().clearTop();
+            el.addClassName(STYLENAME_POSITION_TOP);
+            el.addClassName(STYLENAME_POSITION_CENTER);
             break;
         case BOTTOM_CENTER:
             center();
-            style.clearTop();
-            style.setBottom(0, Unit.PX);
+            // Centering sets the top offset
+            el.getStyle().clearTop();
+            el.addClassName(STYLENAME_POSITION_BOTTOM);
+            el.addClassName(STYLENAME_POSITION_CENTER);
             break;
         case ASSISTIVE:
-            style.setTop(-2000, Unit.PX);
-            style.setLeft(-2000, Unit.PX);
+            el.addClassName(STYLENAME_POSITION_ASSISTIVE);
             break;
         default:
         case MIDDLE_CENTER:
-- 
cgit v1.2.3