Popups didn't have the correct border color

2 files changed, 13 insertions, 0 deletions

diff --git a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/window/popup/RwtScoutPopup.java b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/window/popup/RwtScoutPopup.java
index c22962043d..055ac1962e 100644
--- a/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/window/popup/RwtScoutPopup.java
+++ b/org.eclipse.scout.rt.ui.rap/src/org/eclipse/scout/rt/ui/rap/window/popup/RwtScoutPopup.java
@@ -12,6 +12,7 @@ package org.eclipse.scout.rt.ui.rap.window.popup;
 

 import java.util.EventListener;

 

+import org.eclipse.rwt.lifecycle.WidgetUtil;

 import org.eclipse.scout.commons.EventListenerList;

 import org.eclipse.scout.commons.logger.IScoutLogger;

 import org.eclipse.scout.commons.logger.ScoutLogManager;

@@ -46,6 +47,8 @@ public class RwtScoutPopup extends AbstractRwtScoutPart {
   private static IScoutLogger LOG = ScoutLogManager.getLogger(RwtScoutPopup.class);

   public static final String PROP_POPUP_OWNER = "propPopupOwner";

 

+  private static final String POPUP_CUSTOM_VARIANT = "popup";

+

   private Control m_ownerComponent;

   private Rectangle m_ownerBounds;

   private Shell m_window;

@@ -88,6 +91,7 @@ public class RwtScoutPopup extends AbstractRwtScoutPart {
     m_window = new Shell(ownerComponent.getShell(), style);

     m_window.setData("extendedStyle", SWT.POP_UP);

     m_window.setLayout(new FillLayout());

+    m_window.setData(WidgetUtil.CUSTOM_VARIANT, POPUP_CUSTOM_VARIANT);

     //add close listener

     m_window.addDisposeListener(new P_RwtWindowDisposeListener());

 

diff --git a/org.eclipse.scout.rt.ui.rap/theme/scout.css b/org.eclipse.scout.rt.ui.rap/theme/scout.css
index 07d3d100b4..89998a846c 100644
--- a/org.eclipse.scout.rt.ui.rap/theme/scout.css
+++ b/org.eclipse.scout.rt.ui.rap/theme/scout.css
@@ -2323,6 +2323,15 @@ Button-FocusIndicator.tabboxButton-active, Button-FocusIndicator.tabboxButton-ac
 

 /** RwtScoutTabBox / RwtScoutTabItem  end */

 

+/* Popup (Smartfield...) */

+Shell.popup {

+  border: 2px solid #67a8ce;

+  border-radius: 0px;

+  background-color: #f4f8fc;

+}

+

+/* Popup (Smartfield...) end */

+

 /* DateChooserDialog */

 Shell.datechooser-dialog {

   border: 2px solid #67a8ce;