From 2185185a8dc4e04e174835ffa4c29f3118f00a15 Mon Sep 17 00:00:00 2001 From: "chanial%noos.fr" Date: Fri, 5 Mar 2004 06:32:18 +0000 Subject: [PATCH] Bug 236484: check for the attributes "focused" and "_moz-menuactive" in WidgetStateChanged. r+sr=bz git-svn-id: svn://10.0.0.236/trunk@153564 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/gfx/src/gtk/nsNativeThemeGTK.cpp | 3 ++- mozilla/toolkit/skin/gtk2/menu.css | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mozilla/gfx/src/gtk/nsNativeThemeGTK.cpp b/mozilla/gfx/src/gtk/nsNativeThemeGTK.cpp index 453e663e475..c2f78ae6105 100644 --- a/mozilla/gfx/src/gtk/nsNativeThemeGTK.cpp +++ b/mozilla/gfx/src/gtk/nsNativeThemeGTK.cpp @@ -622,7 +622,8 @@ nsNativeThemeGTK::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType, // disabled, checked, dlgtype, default, etc. *aShouldRepaint = PR_FALSE; if (aAttribute == mDisabledAtom || aAttribute == mCheckedAtom || - aAttribute == mSelectedAtom) + aAttribute == mSelectedAtom || aAttribute == mFocusedAtom || + aAttribute == mMenuActiveAtom) *aShouldRepaint = PR_TRUE; } diff --git a/mozilla/toolkit/skin/gtk2/menu.css b/mozilla/toolkit/skin/gtk2/menu.css index 0c1c849bf81..ef54b900877 100644 --- a/mozilla/toolkit/skin/gtk2/menu.css +++ b/mozilla/toolkit/skin/gtk2/menu.css @@ -44,7 +44,8 @@ menuitem[default="true"] { font-weight: bold; } -menu[disabled="true"], menuitem[disabled="true"] { +menu[disabled="true"], +menuitem[disabled="true"] { color: GrayText; } @@ -52,12 +53,12 @@ menubar > menu { padding: 0px 6px 0px 4px; } +/* menu[_moz-menuactive="true"], menuitem[_moz-menuactive="true"] { - /* dummy rule to force repainting when _moz-menuactive changes */ - border-color: transparent; - /* color: HighlightText; should be fg[PRELIGHT] */ + color: HighlightText; should be fg[PRELIGHT] } +*/ /* ::::: menu/menuitems in menulist popups ::::: */