diff options
| author | Robert Schuster <theBohemian@gmx.net> | 2006-06-16 12:54:46 +0000 |
|---|---|---|
| committer | Robert Schuster <theBohemian@gmx.net> | 2006-06-16 12:54:46 +0000 |
| commit | 26a306bcb522e0ceb40e885599301b5bec6dfe4b (patch) | |
| tree | 63964542e9aaa2fb9914ad8f3b9f3978b1e1d9f7 | |
| parent | 6587f111bb2807143ec95ab00b271ce5f9fe3345 (diff) | |
| download | classpath-26a306bcb522e0ceb40e885599301b5bec6dfe4b.tar.gz | |
2006-06-16 Robert Schuster <robertschuster@fsfe.org>
* javax/swing/plaf/metal/MetalMenuBarUI.java:
(update): Added subexpression to if-statement.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | javax/swing/plaf/metal/MetalMenuBarUI.java | 5 |
2 files changed, 13 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2006-06-16 Robert Schuster <robertschuster@fsfe.org> + * javax/swing/plaf/metal/MetalMenuBarUI.java: + (update): Added subexpression to if-statement. + +2006-06-16 Robert Schuster <robertschuster@fsfe.org> + * javax/swing/plaf/basic/BasicRadioButtonUI.java: (installDefaults): Removed unneccessary code. (paint): Removed complex if-cascade, revert to default icon if @@ -162,6 +167,7 @@ Added serialization UID and changed to extend javax.management.JMException. +>>>>>>> 1.7826 2006-06-14 Lillian Angel <langel@redhat.com> * java/awt/Component.java @@ -340,6 +346,7 @@ compatibility with filters. (getParameter): Modified to allow access to above. +>>>>>>> 1.7824 2006-06-13 Sven de Marothy <sven@physto.se> * gnu/java/awt/peer/gtk/CairoSurface.java @@ -361,6 +368,7 @@ or not the labels are visible, (paintTrack): Shift track down one pixel. +>>>>>>> 1.7799 2006-06-13 Lillian Angel <langel@redhat.com> * java/awt/image/PixelGrabber.java @@ -1131,6 +1139,7 @@ (TreeIncrementAction.actionPerformed): Use action name as command. (TreeIncrementAction.isEnabled): Implemented. +>>>>>>> 1.7796 2006-06-08 Mark Wielaard <mark@klomp.org> PR 27917 diff --git a/javax/swing/plaf/metal/MetalMenuBarUI.java b/javax/swing/plaf/metal/MetalMenuBarUI.java index 31d8d671f..ff763ea9d 100644 --- a/javax/swing/plaf/metal/MetalMenuBarUI.java +++ b/javax/swing/plaf/metal/MetalMenuBarUI.java @@ -44,6 +44,7 @@ import javax.swing.JComponent; import javax.swing.SwingConstants; import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; +import javax.swing.plaf.UIResource; import javax.swing.plaf.basic.BasicMenuBarUI; /** @@ -75,7 +76,9 @@ public class MetalMenuBarUI extends BasicMenuBarUI */ public void update(Graphics g, JComponent c) { - if (c.isOpaque() && UIManager.get("MenuBar.gradient") != null) + if (c.isOpaque() + && UIManager.get("MenuBar.gradient") != null + && c.getBackground() instanceof UIResource) { MetalUtils.paintGradient(g, 0, 0, c.getWidth(), c.getHeight(), SwingConstants.VERTICAL, "MenuBar.gradient"); |