From dd9784b3f2fa17600d6c1a1de0914d82662f06a3 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Tue, 18 Feb 2020 13:36:07 +0100
Subject: [PATCH] UI defaults: added UI values that are defined in
 MetalLookAndFeel but not in BasicLookAndFeel; also added UI values that have
 different values in Metal and Basic LaF

(preparation for replacing "base" Metal LaF with BasicLookAndFeel)
---
 .../src/main/java/com/formdev/flatlaf/FlatLaf.java  | 12 +++++++++++-
 .../com/formdev/flatlaf/FlatLaf.properties          | 13 +++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
index 2e823615..bba1fa43 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
@@ -232,7 +232,17 @@ public abstract class FlatLaf
 			"TextPane.disabledBackground",
 			"TextPane.inactiveBackground" );
 		putDefaults( defaults, defaults.getColor( "textInactiveText" ),
-			"Spinner.disabledForeground" );
+			"Button.disabledText",
+			"CheckBox.disabledText",
+			"CheckBoxMenuItem.disabledForeground",
+			"Menu.disabledForeground",
+			"MenuItem.disabledForeground",
+			"RadioButton.disabledText",
+			"RadioButtonMenuItem.disabledForeground",
+			"Spinner.disabledForeground",
+			"ToggleButton.disabledText" );
+		putDefaults( defaults, defaults.getColor( "textText" ),
+			"DesktopIcon.foreground" );
 
 		// remember MenuBarUI from Mac Aqua LaF if Mac screen menubar is enabled
 		boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) );
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
index 3bded8d4..a21b1ff3 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -163,6 +163,7 @@ CheckBoxMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon
 CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
 CheckBoxMenuItem.margin=@menuItemMargin
 CheckBoxMenuItem.opaque=false
+CheckBoxMenuItem.borderPainted=true
 CheckBoxMenuItem.background=@menuBackground
 
 
@@ -211,6 +212,7 @@ FileChooser.upFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon
 FileChooser.homeFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon
 FileChooser.detailsViewIcon=com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon
 FileChooser.listViewIcon=com.formdev.flatlaf.icons.FlatFileChooserListViewIcon
+FileChooser.usesSingleFilePane=true
 
 
 #---- FileView ----
@@ -288,6 +290,7 @@ Menu.margin=@menuItemMargin
 Menu.submenuPopupOffsetX={scaledInteger}-4
 Menu.submenuPopupOffsetY={scaledInteger}-4
 Menu.opaque=false
+Menu.borderPainted=true
 Menu.background=@menuBackground
 
 
@@ -304,7 +307,10 @@ MenuItem.border=com.formdev.flatlaf.ui.FlatMenuItemBorder
 MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
 MenuItem.margin=@menuItemMargin
 MenuItem.opaque=false
+MenuItem.borderPainted=true
 MenuItem.background=@menuBackground
+MenuItem.acceleratorDelimiter=-
+[mac]MenuItem.acceleratorDelimiter=
 
 
 #---- OptionPane ----
@@ -380,6 +386,7 @@ RadioButtonMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatRadioButtonMenuItemI
 RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
 RadioButtonMenuItem.margin=@menuItemMargin
 RadioButtonMenuItem.opaque=false
+RadioButtonMenuItem.borderPainted=true
 RadioButtonMenuItem.background=@menuBackground
 
 
@@ -390,6 +397,7 @@ ScrollBar.showButtons=false
 ScrollBar.squareButtons=false
 ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
 ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
+ScrollBar.allowsAbsolutePositioning=true
 
 
 #---- ScrollPane ----
@@ -561,6 +569,11 @@ ToolBar.separatorColor=$Separator.foreground
 ToolBar.spacingBorder=$Button.toolbar.spacingInsets
 
 
+#---- ToolTipManager ----
+
+ToolTipManager.enableToolTipMode=activeApplication
+
+
 #---- ToolTip ----
 
 ToolTip.border=4,6,4,6,$Component.borderColor