summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schuster <theBohemian@gmx.net>2006-07-22 15:45:20 +0000
committerRobert Schuster <theBohemian@gmx.net>2006-07-22 15:45:20 +0000
commit21b04e7c0dd363a8da434eb85091e2d212f11019 (patch)
tree45327ee91a9b234a1dae5aa17fa43bbcbafeb381
parent3969710e16d48d5a73780d821a587a1ff4b6fbe7 (diff)
downloadclasspath-21b04e7c0dd363a8da434eb85091e2d212f11019.tar.gz
2006-07-22 Robert Schuster <robertschuster@fsfe.org>
* javax/swing/plaf/metal/MetalLookAndFeel: (initComponentDefaults): Added new properties, added comments.
-rw-r--r--ChangeLog5
-rw-r--r--javax/swing/plaf/metal/MetalLookAndFeel.java12
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 3199399a5..f517a53e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-22 Robert Schuster <robertschuster@fsfe.org>
+
+ * javax/swing/plaf/metal/MetalLookAndFeel:
+ (initComponentDefaults): Added new properties, added comments.
+
2006-07-22 Andrew John Hughes <gnu_andrew@member.fsf.org>
* doc/vmintegration.texinfo:
diff --git a/javax/swing/plaf/metal/MetalLookAndFeel.java b/javax/swing/plaf/metal/MetalLookAndFeel.java
index 9bc674db5..8a5a61107 100644
--- a/javax/swing/plaf/metal/MetalLookAndFeel.java
+++ b/javax/swing/plaf/metal/MetalLookAndFeel.java
@@ -1185,20 +1185,26 @@ public class MetalLookAndFeel extends BasicLookAndFeel
"SplitPaneDivider.draggingColor", Color.DARK_GRAY,
"TabbedPane.background", getControlShadow(),
+ "TabbedPane.contentBorderInsets", new InsetsUIResource(2, 2, 3, 3),
+ "TabbedPane.contentOpaque", Boolean.TRUE,
"TabbedPane.darkShadow", getControlDarkShadow(),
"TabbedPane.focus", getPrimaryControlDarkShadow(),
"TabbedPane.font", new FontUIResource("Dialog", Font.BOLD, 12),
"TabbedPane.foreground", getControlTextColor(),
"TabbedPane.highlight", getControlHighlight(),
"TabbedPane.light", getControl(),
- "TabbedPane.selected", getControl(),
+ "TabbedPane.selected", getControl(), // overridden in OceanTheme
"TabbedPane.selectHighlight", getControlHighlight(),
"TabbedPane.selectedTabPadInsets", new InsetsUIResource(2, 2, 2, 1),
"TabbedPane.shadow", getControlShadow(),
- "TabbedPane.tabAreaBackground", getControl(),
- "TabbedPane.tabAreaInsets", new InsetsUIResource(4, 2, 0, 6),
+ "TabbedPane.tabAreaBackground", getControl(), // overridden in OceanTheme
+ "TabbedPane.tabAreaInsets", new InsetsUIResource(4, 2, 0, 6), // dito
"TabbedPane.tabInsets", new InsetsUIResource(0, 9, 1, 9),
+ // new properties in OceanTheme:
+ // TabbedPane.contentAreaColor
+ // TabbedPane.unselectedBackground
+
"Table.background", getWindowBackground(),
"Table.focusCellBackground", getWindowBackground(),
"Table.focusCellForeground", getControlTextColor(),