mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-12 15:07:11 -06:00
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)
This commit is contained in:
@@ -232,7 +232,17 @@ public abstract class FlatLaf
|
|||||||
"TextPane.disabledBackground",
|
"TextPane.disabledBackground",
|
||||||
"TextPane.inactiveBackground" );
|
"TextPane.inactiveBackground" );
|
||||||
putDefaults( defaults, defaults.getColor( "textInactiveText" ),
|
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
|
// remember MenuBarUI from Mac Aqua LaF if Mac screen menubar is enabled
|
||||||
boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) );
|
boolean useScreenMenuBar = SystemInfo.IS_MAC && "true".equals( System.getProperty( "apple.laf.useScreenMenuBar" ) );
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ CheckBoxMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon
|
|||||||
CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
CheckBoxMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
||||||
CheckBoxMenuItem.margin=@menuItemMargin
|
CheckBoxMenuItem.margin=@menuItemMargin
|
||||||
CheckBoxMenuItem.opaque=false
|
CheckBoxMenuItem.opaque=false
|
||||||
|
CheckBoxMenuItem.borderPainted=true
|
||||||
CheckBoxMenuItem.background=@menuBackground
|
CheckBoxMenuItem.background=@menuBackground
|
||||||
|
|
||||||
|
|
||||||
@@ -211,6 +212,7 @@ FileChooser.upFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserUpFolderIcon
|
|||||||
FileChooser.homeFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon
|
FileChooser.homeFolderIcon=com.formdev.flatlaf.icons.FlatFileChooserHomeFolderIcon
|
||||||
FileChooser.detailsViewIcon=com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon
|
FileChooser.detailsViewIcon=com.formdev.flatlaf.icons.FlatFileChooserDetailsViewIcon
|
||||||
FileChooser.listViewIcon=com.formdev.flatlaf.icons.FlatFileChooserListViewIcon
|
FileChooser.listViewIcon=com.formdev.flatlaf.icons.FlatFileChooserListViewIcon
|
||||||
|
FileChooser.usesSingleFilePane=true
|
||||||
|
|
||||||
|
|
||||||
#---- FileView ----
|
#---- FileView ----
|
||||||
@@ -288,6 +290,7 @@ Menu.margin=@menuItemMargin
|
|||||||
Menu.submenuPopupOffsetX={scaledInteger}-4
|
Menu.submenuPopupOffsetX={scaledInteger}-4
|
||||||
Menu.submenuPopupOffsetY={scaledInteger}-4
|
Menu.submenuPopupOffsetY={scaledInteger}-4
|
||||||
Menu.opaque=false
|
Menu.opaque=false
|
||||||
|
Menu.borderPainted=true
|
||||||
Menu.background=@menuBackground
|
Menu.background=@menuBackground
|
||||||
|
|
||||||
|
|
||||||
@@ -304,7 +307,10 @@ MenuItem.border=com.formdev.flatlaf.ui.FlatMenuItemBorder
|
|||||||
MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
MenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
||||||
MenuItem.margin=@menuItemMargin
|
MenuItem.margin=@menuItemMargin
|
||||||
MenuItem.opaque=false
|
MenuItem.opaque=false
|
||||||
|
MenuItem.borderPainted=true
|
||||||
MenuItem.background=@menuBackground
|
MenuItem.background=@menuBackground
|
||||||
|
MenuItem.acceleratorDelimiter=-
|
||||||
|
[mac]MenuItem.acceleratorDelimiter=
|
||||||
|
|
||||||
|
|
||||||
#---- OptionPane ----
|
#---- OptionPane ----
|
||||||
@@ -380,6 +386,7 @@ RadioButtonMenuItem.checkIcon=com.formdev.flatlaf.icons.FlatRadioButtonMenuItemI
|
|||||||
RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
RadioButtonMenuItem.arrowIcon=com.formdev.flatlaf.icons.FlatMenuItemArrowIcon
|
||||||
RadioButtonMenuItem.margin=@menuItemMargin
|
RadioButtonMenuItem.margin=@menuItemMargin
|
||||||
RadioButtonMenuItem.opaque=false
|
RadioButtonMenuItem.opaque=false
|
||||||
|
RadioButtonMenuItem.borderPainted=true
|
||||||
RadioButtonMenuItem.background=@menuBackground
|
RadioButtonMenuItem.background=@menuBackground
|
||||||
|
|
||||||
|
|
||||||
@@ -390,6 +397,7 @@ ScrollBar.showButtons=false
|
|||||||
ScrollBar.squareButtons=false
|
ScrollBar.squareButtons=false
|
||||||
ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
|
ScrollBar.buttonArrowColor=$ComboBox.buttonArrowColor
|
||||||
ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
|
ScrollBar.buttonDisabledArrowColor=$ComboBox.buttonDisabledArrowColor
|
||||||
|
ScrollBar.allowsAbsolutePositioning=true
|
||||||
|
|
||||||
|
|
||||||
#---- ScrollPane ----
|
#---- ScrollPane ----
|
||||||
@@ -561,6 +569,11 @@ ToolBar.separatorColor=$Separator.foreground
|
|||||||
ToolBar.spacingBorder=$Button.toolbar.spacingInsets
|
ToolBar.spacingBorder=$Button.toolbar.spacingInsets
|
||||||
|
|
||||||
|
|
||||||
|
#---- ToolTipManager ----
|
||||||
|
|
||||||
|
ToolTipManager.enableToolTipMode=activeApplication
|
||||||
|
|
||||||
|
|
||||||
#---- ToolTip ----
|
#---- ToolTip ----
|
||||||
|
|
||||||
ToolTip.border=4,6,4,6,$Component.borderColor
|
ToolTip.border=4,6,4,6,$Component.borderColor
|
||||||
|
|||||||
Reference in New Issue
Block a user