angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

made disabled text color slightly lighter in dark themes for better readability (issue #174)

Browse Source
This commit is contained in:
Karl Tauber
2020-09-15 15:47:12 +02:00
parent e292d3444c
commit a8744b2bb4
5 changed files with 43 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -12,6 +12,8 @@ FlatLaf Change Log
- `FlatUIDefaultsInspector` added (see [FlatLaf Extras](flatlaf-extras)). A
simple UI defaults inspector that shows a window with all UI defaults used in
current theme (look and feel).
- Made disabled text color slightly lighter in dark themes for better
readability. (issue #174)
#### Fixed bugs

2
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -26,7 +26,7 @@
@selectionForeground=@foreground
@selectionInactiveBackground=#0D293E
@selectionInactiveForeground=@foreground
@disabledText=#777
@disabledText=#888
@textComponentBackground=#45494A
@menuBackground=darken(@background,5%)
@menuHoverBackground=lighten(@menuBackground,10%,derived)

6
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.java
View File

@@ -305,6 +305,7 @@ class DemoFrame
JMenuItem projectViewMenuItem = new JMenuItem();
JMenuItem structureViewMenuItem = new JMenuItem();
JMenuItem propertiesViewMenuItem = new JMenuItem();
JMenuItem menuItem2 = new JMenuItem();
JMenuItem menuItem1 = new JMenuItem();
JRadioButtonMenuItem radioButtonMenuItem1 = new JRadioButtonMenuItem();
JRadioButtonMenuItem radioButtonMenuItem2 = new JRadioButtonMenuItem();
@@ -506,6 +507,11 @@ class DemoFrame
}
viewMenu.add(menu1);
//---- menuItem2 ----
menuItem2.setText("Disabled Item");
menuItem2.setEnabled(false);
viewMenu.add(menuItem2);
//---- menuItem1 ----
menuItem1.setText("<html>some <b color=\"red\">HTML</b> <i color=\"blue\">text</i></html>");
viewMenu.add(menuItem1);

5
flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/DemoFrame.jfd
View File

@@ -274,6 +274,11 @@ new FormModel {
addEvent( new FormEvent( "java.awt.event.ActionListener", "actionPerformed", "menuItemActionPerformed", true ) )
} )
} )
add( new FormComponent( "javax.swing.JMenuItem" ) {
name: "menuItem2"
"text": "Disabled Item"
"enabled": false
} )
add( new FormComponent( "javax.swing.JMenuItem" ) {
name: "menuItem1"
"text": "<html>some <b color=\"red\">HTML</b> <i color=\"blue\">text</i></html>"

58
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt
View File

@@ -81,7 +81,7 @@ Button.defaultButtonFollowsFocus true
Button.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
Button.disabledBorderColor #5e6060 javax.swing.plaf.ColorUIResource [UI]
Button.disabledSelectedBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
Button.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
Button.disabledText #888888 javax.swing.plaf.ColorUIResource [UI]
Button.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI]
Button.font [active] $defaultFont [UI]
Button.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -117,7 +117,7 @@ Caret.width [active] 1
CheckBox.arc 4
CheckBox.background #3c3f41 javax.swing.plaf.ColorUIResource [UI]
CheckBox.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMarginBorder [UI]
CheckBox.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
CheckBox.disabledText #888888 javax.swing.plaf.ColorUIResource [UI]
CheckBox.font [active] $defaultFont [UI]
CheckBox.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
CheckBox.icon.background #43494a javax.swing.plaf.ColorUIResource [UI]
@@ -156,7 +156,7 @@ CheckBoxMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
CheckBoxMenuItem.borderPainted true
CheckBoxMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxMenuItemIcon [UI]
CheckBoxMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.font [active] $defaultFont [UI]
CheckBoxMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
CheckBoxMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -196,7 +196,7 @@ ComboBox.buttonHoverArrowColor #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ComboBox.buttonShadow #646464 javax.swing.plaf.ColorUIResource [UI]
ComboBox.buttonStyle auto
ComboBox.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ComboBox.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
ComboBox.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
ComboBox.editorColumns 0
ComboBox.font [active] $defaultFont [UI]
ComboBox.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -270,7 +270,7 @@ EditorPane.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
EditorPane.font [active] $defaultFont [UI]
EditorPane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
EditorPane.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
EditorPane.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
EditorPane.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
EditorPane.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
EditorPane.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
EditorPane.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -309,9 +309,9 @@ FormattedTextField.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResourc
FormattedTextField.font [active] $defaultFont [UI]
FormattedTextField.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
FormattedTextField.placeholderForeground #777777 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.placeholderForeground #888888 javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
FormattedTextField.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
FormattedTextFieldUI com.formdev.flatlaf.ui.FlatFormattedTextFieldUI
@@ -339,7 +339,7 @@ HelpButton.questionMarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
#---- Hyperlink ----
Hyperlink.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
Hyperlink.disabledText #888888 javax.swing.plaf.ColorUIResource [UI]
Hyperlink.linkColor #589df6 javax.swing.plaf.ColorUIResource [UI]
Hyperlink.visitedColor #589df6 javax.swing.plaf.ColorUIResource [UI]
HyperlinkUI com.formdev.flatlaf.swingx.ui.FlatHyperlinkUI
@@ -375,7 +375,7 @@ InternalFrame.inactiveBorderColor #353739 javax.swing.plaf.ColorUIResource [U
InternalFrame.inactiveDropShadowInsets 3,3,4,4 javax.swing.plaf.InsetsUIResource [UI]
InternalFrame.inactiveDropShadowOpacity 0.75
InternalFrame.inactiveTitleBackground #303234 javax.swing.plaf.ColorUIResource [UI]
InternalFrame.inactiveTitleForeground #777777 javax.swing.plaf.ColorUIResource [UI]
InternalFrame.inactiveTitleForeground #888888 javax.swing.plaf.ColorUIResource [UI]
InternalFrame.maximizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameMaximizeIcon [UI]
InternalFrame.minimizeIcon [lazy] 24,24 com.formdev.flatlaf.icons.FlatInternalFrameRestoreIcon [UI]
InternalFrame.titleFont [active] $defaultFont [UI]
@@ -416,15 +416,15 @@ JXHeader.startBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.arrowColor #bbbbbb javax.swing.plaf.ColorUIResource [UI]
JXMonthView.background #45494a javax.swing.plaf.ColorUIResource [UI]
JXMonthView.daysOfTheWeekForeground #aaaaaa javax.swing.plaf.ColorUIResource [UI]
JXMonthView.disabledArrowColor #777777 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.disabledArrowColor #888888 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.flaggedDayForeground #e05555 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.leadingDayForeground #777777 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.leadingDayForeground #888888 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.monthDownFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.FlatMonthDownIcon [UI]
JXMonthView.monthStringBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.monthStringForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
JXMonthView.monthUpFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon [UI]
JXMonthView.selectedBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
JXMonthView.trailingDayForeground #777777 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.trailingDayForeground #888888 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.unselectableDayForeground #e05555 javax.swing.plaf.ColorUIResource [UI]
JXMonthView.weekOfTheYearForeground #888888 javax.swing.plaf.ColorUIResource [UI]
@@ -453,7 +453,7 @@ JideTabbedPaneUI com.formdev.flatlaf.jideoss.ui.FlatJideTabbedPane
#---- Label ----
Label.background #3c3f41 javax.swing.plaf.ColorUIResource [UI]
Label.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
Label.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
Label.disabledShadow #646464 javax.swing.plaf.ColorUIResource [UI]
Label.font [active] $defaultFont [UI]
Label.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -496,7 +496,7 @@ Menu.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.F
Menu.borderPainted true
Menu.cancelMode hideLastSubmenu
Menu.crossMenuMnemonic true
Menu.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
Menu.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
Menu.font [active] $defaultFont [UI]
Menu.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
Menu.icon.arrowColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI]
@@ -544,7 +544,7 @@ MenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.F
MenuItem.borderPainted true
MenuItem.checkBackground #484c4f com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse)
MenuItem.checkMargins 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI]
MenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
MenuItem.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
MenuItem.font [active] $defaultFont [UI]
MenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
MenuItem.iconTextGap 6
@@ -647,9 +647,9 @@ PasswordField.echoChar '\u2022'
PasswordField.font [active] $defaultFont [UI]
PasswordField.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
PasswordField.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
PasswordField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
PasswordField.placeholderForeground #777777 javax.swing.plaf.ColorUIResource [UI]
PasswordField.placeholderForeground #888888 javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
PasswordField.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
PasswordFieldUI com.formdev.flatlaf.ui.FlatPasswordFieldUI
@@ -710,7 +710,7 @@ ProgressBarUI com.formdev.flatlaf.ui.FlatProgressBarUI
RadioButton.background #3c3f41 javax.swing.plaf.ColorUIResource [UI]
RadioButton.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMarginBorder [UI]
RadioButton.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
RadioButton.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
RadioButton.disabledText #888888 javax.swing.plaf.ColorUIResource [UI]
RadioButton.font [active] $defaultFont [UI]
RadioButton.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
RadioButton.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
@@ -736,7 +736,7 @@ RadioButtonMenuItem.background #303234 javax.swing.plaf.ColorUIResource [UI]
RadioButtonMenuItem.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMenuItemBorder [UI]
RadioButtonMenuItem.borderPainted true
RadioButtonMenuItem.checkIcon [lazy] 15,15 com.formdev.flatlaf.icons.FlatRadioButtonMenuItemIcon [UI]
RadioButtonMenuItem.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
RadioButtonMenuItem.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
RadioButtonMenuItem.font [active] $defaultFont [UI]
RadioButtonMenuItem.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
RadioButtonMenuItem.margin 3,6,3,6 javax.swing.plaf.InsetsUIResource [UI]
@@ -867,7 +867,7 @@ Spinner.buttonDisabledArrowColor #585858 javax.swing.plaf.ColorUIResource [UI
Spinner.buttonHoverArrowColor #bbbbbb javax.swing.plaf.ColorUIResource [UI]
Spinner.buttonStyle button
Spinner.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
Spinner.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
Spinner.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
Spinner.editorAlignment 11
Spinner.editorBorderPainted false
Spinner.font [active] $defaultFont [UI]
@@ -908,7 +908,7 @@ TabbedPane.contentAreaColor #323232 javax.swing.plaf.ColorUIResource [UI]
TabbedPane.contentOpaque true
TabbedPane.contentSeparatorHeight 1
TabbedPane.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
TabbedPane.disabledForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TabbedPane.disabledForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TabbedPane.disabledUnderlineColor #7a7a7a javax.swing.plaf.ColorUIResource [UI]
TabbedPane.focus #bbbbbb javax.swing.plaf.ColorUIResource [UI]
TabbedPane.focusColor #3d4b5c javax.swing.plaf.ColorUIResource [UI]
@@ -1014,7 +1014,7 @@ TextArea.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
TextArea.font [active] $defaultFont [UI]
TextArea.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
TextArea.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
TextArea.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TextArea.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TextArea.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
TextArea.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
TextArea.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -1039,10 +1039,10 @@ TextField.font [active] $defaultFont [UI]
TextField.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
TextField.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TextField.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TextField.light #313131 javax.swing.plaf.ColorUIResource [UI]
TextField.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
TextField.placeholderForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TextField.placeholderForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TextField.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
TextField.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
TextField.shadow #646464 javax.swing.plaf.ColorUIResource [UI]
@@ -1059,7 +1059,7 @@ TextPane.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
TextPane.font [active] $defaultFont [UI]
TextPane.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
TextPane.inactiveBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
TextPane.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TextPane.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TextPane.margin 2,6,2,6 javax.swing.plaf.InsetsUIResource [UI]
TextPane.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI]
TextPane.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -1084,7 +1084,7 @@ TitlePane.iconMargins 3,8,3,0 javax.swing.plaf.InsetsUIResource [UI]
TitlePane.iconSize 16,16 javax.swing.plaf.DimensionUIResource [UI]
TitlePane.iconifyIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowIconifyIcon [UI]
TitlePane.inactiveBackground #303234 javax.swing.plaf.ColorUIResource [UI]
TitlePane.inactiveForeground #777777 javax.swing.plaf.ColorUIResource [UI]
TitlePane.inactiveForeground #888888 javax.swing.plaf.ColorUIResource [UI]
TitlePane.maximizeIcon [lazy] 44,30 com.formdev.flatlaf.icons.FlatWindowMaximizeIcon [UI]
TitlePane.menuBarEmbedded true
TitlePane.menuBarMargins 0,8,0,22 javax.swing.plaf.InsetsUIResource [UI]
@@ -1111,7 +1111,7 @@ ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F
ToggleButton.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse)
ToggleButton.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledText #888888 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.font [active] $defaultFont [UI]
ToggleButton.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ToggleButton.highlight #242424 javax.swing.plaf.ColorUIResource [UI]
@@ -1145,7 +1145,7 @@ ToolBar.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
ToolBar.dockingBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ToolBar.dockingForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ToolBar.floatingBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI]
ToolBar.floatingForeground #777777 javax.swing.plaf.ColorUIResource [UI]
ToolBar.floatingForeground #888888 javax.swing.plaf.ColorUIResource [UI]
ToolBar.font [active] $defaultFont [UI]
ToolBar.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ToolBar.gripColor #adadad javax.swing.plaf.ColorUIResource [UI]
@@ -1291,7 +1291,7 @@ swingx/TaskPaneUI com.formdev.flatlaf.swingx.ui.FlatTaskPaneUI
text #45494a javax.swing.plaf.ColorUIResource [UI]
textHighlight #4b6eaf javax.swing.plaf.ColorUIResource [UI]
textHighlightText #bbbbbb javax.swing.plaf.ColorUIResource [UI]
textInactiveText #777777 javax.swing.plaf.ColorUIResource [UI]
textInactiveText #888888 javax.swing.plaf.ColorUIResource [UI]
textText #bbbbbb javax.swing.plaf.ColorUIResource [UI]
window #3c3f41 javax.swing.plaf.ColorUIResource [UI]
windowBorder #bbbbbb javax.swing.plaf.ColorUIResource [UI]