jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java
changeset 25118 d237e069dd9c
parent 22574 7f8ce0c8c20a
child 25178 dbab904451e9
--- a/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java	Fri May 30 14:23:25 2014 +0400
+++ b/jdk/src/share/classes/javax/swing/plaf/metal/MetalTabbedPaneUI.java	Fri May 30 15:24:42 2014 +0400
@@ -806,9 +806,8 @@
 
         // Paint the background for the tab area
         if ( tabPane.isOpaque() ) {
-            Color bg = UIManager.getColor("TabbedPane.tabAreaBackground");
-            if (bg != null) {
-                g.setColor(bg);
+            if (!c.isBackgroundSet() && (tabAreaBackground != null)) {
+                g.setColor(tabAreaBackground);
             }
             else {
                 g.setColor( c.getBackground() );