changeset 6219:214fddde54f6

RT-33312 - menu-button:armed and menu-button:hover set -fx-color. For a context-menu, we want -fx-color to be -fx-base
author David Grieve<david.grieve@oracle.com>
date Thu, 30 Jan 2014 16:31:58 -0500
parents 16dde7ae7840
children 232c156edd82
files modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css
diffstat 1 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Thu Jan 30 16:31:31 2014 -0500
+++ b/modules/controls/src/main/resources/com/sun/javafx/scene/control/skin/caspian/caspian.css	Thu Jan 30 16:31:58 2014 -0500
@@ -755,6 +755,7 @@
  ******************************************************************************/
 
 .context-menu {
+    -fx-color: -fx-base;
     -fx-background-color:
         derive(-fx-color,-40%),
         derive(-fx-color,100%),
@@ -782,8 +783,15 @@
 
 .context-menu:show-mnemonics > .mnemonic-underline {
     -fx-stroke: -fx-text-fill;
-} 
-
+}
+
+/*
+ * RT-33312 - if the context-menu is belongs to a menu-button, then set the context-menu's -fx-color to -fx-base
+ * effectively overriding the menu-button:armed, menu-button:hover styling of -fx-color
+ */
+.menu-button > * > .context-menu {
+    -fx-color: -fx-base;
+}
 
 /*******************************************************************************
  *                                                                             *