Window close and maximize/restore buttons not visible on initial render in IE8 (Valo...

Remove unnecessary FontAwesome declaration as well, which made the
characters look bad in IE8.

Change-Id: Ib0f9b01023b0a7a6f40513c80cbb6e6c69bd164c

diff --git a/WebContent/VAADIN/themes/valo/components/_window.scss b/WebContent/VAADIN/themes/valo/components/_window.scss
index d866ce2584db65a32be4ced307daaf8f9287cd72..97859a62b20705b77abe59d4c0cd9a0d8c7a4c37 100644 (file)
--- a/WebContent/VAADIN/themes/valo/components/_window.scss
+++ b/WebContent/VAADIN/themes/valo/components/_window.scss
@@ -125,7 +125,6 @@ $v-window-modality-curtain-background-color: #222 !default;
     line-height: $v-unit-size - 3px;
     text-align: center;
     cursor: pointer;
-    font-family: FontAwesome;
     font-size: round($v-font-size * 1.3);
     color: valo-font-color($v-window-background-color, .4);
 

diff --git a/client/src/com/vaadin/client/ui/VWindow.java b/client/src/com/vaadin/client/ui/VWindow.java
index 495e2301560df66b9b6a62109a78acc3f07958c0..7223e4ac83976b91f4ef6b726a4ad0afee89790e 100644 (file)
--- a/client/src/com/vaadin/client/ui/VWindow.java
+++ b/client/src/com/vaadin/client/ui/VWindow.java
@@ -245,6 +245,20 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner,
          * state.
          */
         setTabStopEnabled(doTabStop);
+
+        // Fix for #14413. Any pseudo elements inside these elements are not
+        // visible on initial render unless we shake the DOM.
+        if (BrowserInfo.get().isIE8()) {
+            closeBox.getStyle().setDisplay(Display.NONE);
+            maximizeRestoreBox.getStyle().setDisplay(Display.NONE);
+            Scheduler.get().scheduleFinally(new Command() {
+                @Override
+                public void execute() {
+                    closeBox.getStyle().clearDisplay();
+                    maximizeRestoreBox.getStyle().clearDisplay();
+                }
+            });
+        }
     }
 
     @Override