Changeset 4374

Timestamp:

10/15/03 12:07:24 (19 years ago)

Author:

piso

Message:

paint(): make sure key text is grayed out when menu item is disabled.

File:

• trunk/j/src/org/armedbear/j/MenuItem.java (modified) (3 diffs)

trunk/j/src/org/armedbear/j/MenuItem.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2003 Peter Graves
- * $Id: MenuItem.java,v 1.3 2003-07-25 17:47:12 piso Exp $
+ * $Id: MenuItem.java,v 1.4 2003-10-15 12:07:24 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -39 +39 @@
         UIManager.getFont("MenuItem.acceleratorFont");
     private static final Color acceleratorForeground =
-         UIManager.getColor("MenuItem.acceleratorForeground");
+        UIManager.getColor("MenuItem.acceleratorForeground");
     private static final Color acceleratorSelectionForeground =
         UIManager.getColor("MenuItem.acceleratorSelectionForeground");
+    private static final Color disabledForeground =
+        UIManager.getColor("MenuItem.disabledForeground");
 
     private final String acceleratorText;
@@ -67 +69 @@
         if (acceleratorText != null) {
             g.setFont(acceleratorFont);
-            g.setColor(getModel().isArmed() ? acceleratorSelectionForeground : acceleratorForeground);
+            Color c;
+            if (isEnabled())
+                c = getModel().isArmed() ? acceleratorSelectionForeground : acceleratorForeground;
+            else
+                c = disabledForeground;
+            g.setColor(c);
             FontMetrics fm = g.getFontMetrics();
             Insets insets = getInsets();