Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-08 15:00:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Theming improvements:

Browse Source 
- renamed `@disabledText` to `@disabledForeground`
- renamed `@textComponentBackground` to `@componentBackground`
- renamed `@textComponentMargin` to `@componentMargin`
- added `@disabledBackground`

(Note: this are incompatible changes!)
This commit is contained in:
Karl Tauber
2021-10-03 23:15:51 +02:00
parent 4db39828ef
commit f0c314df80
9 changed files with 78 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,11 +35,12 @@
# general background and foreground (text color) # general background and foreground (text color)
@background = #3c3f41 @background = #3c3f41
@foreground = #bbb @foreground = #bbb
@disabledText = shade(@foreground,25%) @disabledBackground = @background
@disabledForeground = shade(@foreground,25%)
# component background # component background
@buttonBackground = tint(@background,9%) @buttonBackground = tint(@background,9%)
@textComponentBackground = tint(@background,5%) @componentBackground = tint(@background,5%)
@menuBackground = darken(@background,5%) @menuBackground = darken(@background,5%)
# selection # selection
@@ -136,7 +137,7 @@ CheckBox.icon.checkmarkColor = shade(@foreground,10%)
# disabled # disabled
CheckBox.icon.disabledBorderColor = shade($CheckBox.icon.borderColor,20%) CheckBox.icon.disabledBorderColor = shade($CheckBox.icon.borderColor,20%)
CheckBox.icon.disabledBackground = @background CheckBox.icon.disabledBackground = @disabledBackground
CheckBox.icon.disabledCheckmarkColor = darken($CheckBox.icon.checkmarkColor,25%) CheckBox.icon.disabledCheckmarkColor = darken($CheckBox.icon.checkmarkColor,25%)
# focused # focused
@@ -200,7 +201,7 @@ HelpButton.disabledQuestionMarkColor = tint(@background,30%)
InternalFrame.activeTitleBackground = darken(@background,10%) InternalFrame.activeTitleBackground = darken(@background,10%)
InternalFrame.activeTitleForeground = @foreground InternalFrame.activeTitleForeground = @foreground
InternalFrame.inactiveTitleBackground = lighten($InternalFrame.activeTitleBackground,5%) InternalFrame.inactiveTitleBackground = lighten($InternalFrame.activeTitleBackground,5%)
InternalFrame.inactiveTitleForeground = @disabledText InternalFrame.inactiveTitleForeground = @disabledForeground
InternalFrame.activeBorderColor = darken(@background,7%) InternalFrame.activeBorderColor = darken(@background,7%)
InternalFrame.inactiveBorderColor = darken(@background,3%) InternalFrame.inactiveBorderColor = darken(@background,3%)
@@ -284,7 +285,7 @@ Separator.foreground = tint(@background,10%)
Slider.trackValueColor = @accentSliderColor Slider.trackValueColor = @accentSliderColor
Slider.trackColor = lighten(@background,15%) Slider.trackColor = lighten(@background,15%)
Slider.thumbColor = $Slider.trackValueColor Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor = @disabledText Slider.tickColor = @disabledForeground
Slider.focusedColor = fade($Component.focusColor,70%,derived) Slider.focusedColor = fade($Component.focusColor,70%,derived)
Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived) Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived)
Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived) Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived)
@@ -309,7 +310,7 @@ TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAu
TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse) TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse)
TabbedPane.closeBackground = null TabbedPane.closeBackground = null
TabbedPane.closeForeground = @disabledText TabbedPane.closeForeground = @disabledForeground
TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived) TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived)
TabbedPane.closeHoverForeground = @foreground TabbedPane.closeHoverForeground = @foreground
TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived) TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived)

70
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
View File

@@ -75,7 +75,7 @@ ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI
#---- variables ---- #---- variables ----
@textComponentMargin = 2,6,2,6 @componentMargin = 2,6,2,6
@menuItemMargin = 3,6,3,6 @menuItemMargin = 3,6,3,6
@@ -83,21 +83,21 @@ ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI
*.background = @background *.background = @background
*.foreground = @foreground *.foreground = @foreground
*.caretForeground = @foreground *.disabledBackground = @disabledBackground
*.inactiveBackground = @background *.disabledForeground = @disabledForeground
*.inactiveForeground = @disabledText *.disabledText = @disabledForeground
*.inactiveBackground = @disabledBackground
*.inactiveForeground = @disabledForeground
*.selectionBackground = @selectionBackground *.selectionBackground = @selectionBackground
*.selectionForeground = @selectionForeground *.selectionForeground = @selectionForeground
*.disabledBackground = @background *.caretForeground = @foreground
*.disabledForeground = @disabledText
*.disabledText = @disabledText
*.acceleratorForeground = @menuAcceleratorForeground *.acceleratorForeground = @menuAcceleratorForeground
*.acceleratorSelectionForeground = @menuAcceleratorSelectionForeground *.acceleratorSelectionForeground = @menuAcceleratorSelectionForeground
#---- system colors ---- #---- system colors ----
desktop = @textComponentBackground desktop = @componentBackground
activeCaptionText = @foreground activeCaptionText = @foreground
activeCaptionBorder = $activeCaption activeCaptionBorder = $activeCaption
inactiveCaptionText = @foreground inactiveCaptionText = @foreground
@@ -107,11 +107,11 @@ windowBorder = @foreground
windowText = @foreground windowText = @foreground
menu = @background menu = @background
menuText = @foreground menuText = @foreground
text = @textComponentBackground text = @componentBackground
textText = @foreground textText = @foreground
textHighlight = @selectionBackground textHighlight = @selectionBackground
textHighlightText = @selectionForeground textHighlightText = @selectionForeground
textInactiveText = @disabledText textInactiveText = @disabledForeground
control = @background control = @background
controlText = @foreground controlText = @foreground
controlShadow = $Component.borderColor controlShadow = $Component.borderColor
@@ -205,14 +205,14 @@ ColorChooser.swatchesDefaultRecentColor = $control
#---- ComboBox ---- #---- ComboBox ----
ComboBox.border = com.formdev.flatlaf.ui.FlatRoundBorder ComboBox.border = com.formdev.flatlaf.ui.FlatRoundBorder
ComboBox.padding = @textComponentMargin ComboBox.padding = @componentMargin
ComboBox.minimumWidth = 72 ComboBox.minimumWidth = 72
ComboBox.editorColumns = 0 ComboBox.editorColumns = 0
ComboBox.maximumRowCount = 15 ComboBox.maximumRowCount = 15
[mac]ComboBox.showPopupOnNavigation = true [mac]ComboBox.showPopupOnNavigation = true
# allowed values: auto, button or none # allowed values: auto, button or none
ComboBox.buttonStyle = auto ComboBox.buttonStyle = auto
ComboBox.background = @textComponentBackground ComboBox.background = @componentBackground
ComboBox.buttonBackground = $ComboBox.background ComboBox.buttonBackground = $ComboBox.background
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%) ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
ComboBox.buttonSeparatorColor = $Component.borderColor ComboBox.buttonSeparatorColor = $Component.borderColor
@@ -246,8 +246,8 @@ DesktopIcon.closeIcon = com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon
#---- EditorPane ---- #---- EditorPane ----
EditorPane.border = com.formdev.flatlaf.ui.FlatMarginBorder EditorPane.border = com.formdev.flatlaf.ui.FlatMarginBorder
EditorPane.margin = @textComponentMargin EditorPane.margin = @componentMargin
EditorPane.background = @textComponentBackground EditorPane.background = @componentBackground
#---- FileChooser ---- #---- FileChooser ----
@@ -273,9 +273,9 @@ FileView.floppyDriveIcon = com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon
#---- FormattedTextField ---- #---- FormattedTextField ----
FormattedTextField.border = com.formdev.flatlaf.ui.FlatTextBorder FormattedTextField.border = com.formdev.flatlaf.ui.FlatTextBorder
FormattedTextField.margin = @textComponentMargin FormattedTextField.margin = @componentMargin
FormattedTextField.background = @textComponentBackground FormattedTextField.background = @componentBackground
FormattedTextField.placeholderForeground = @disabledText FormattedTextField.placeholderForeground = @disabledForeground
FormattedTextField.iconTextGap = 4 FormattedTextField.iconTextGap = 4
@@ -329,7 +329,7 @@ List.cellFocusColor = @cellFocusColor
List.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Default List.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Default
List.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Focused List.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Focused
List.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Selected List.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Selected
List.background = @textComponentBackground List.background = @componentBackground
List.selectionInactiveBackground = @selectionInactiveBackground List.selectionInactiveBackground = @selectionInactiveBackground
List.selectionInactiveForeground = @selectionInactiveForeground List.selectionInactiveForeground = @selectionInactiveForeground
List.dropCellBackground = @dropCellBackground List.dropCellBackground = @dropCellBackground
@@ -412,9 +412,9 @@ OptionPane.warningIcon = com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon
#---- PasswordField ---- #---- PasswordField ----
PasswordField.border = com.formdev.flatlaf.ui.FlatTextBorder PasswordField.border = com.formdev.flatlaf.ui.FlatTextBorder
PasswordField.margin = @textComponentMargin PasswordField.margin = @componentMargin
PasswordField.background = @textComponentBackground PasswordField.background = @componentBackground
PasswordField.placeholderForeground = @disabledText PasswordField.placeholderForeground = @disabledForeground
PasswordField.iconTextGap = 4 PasswordField.iconTextGap = 4
PasswordField.echoChar = \u2022 PasswordField.echoChar = \u2022
PasswordField.showCapsLock = true PasswordField.showCapsLock = true
@@ -546,7 +546,7 @@ Slider.focusWidth = 4
#---- Spinner ---- #---- Spinner ----
Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder
Spinner.background = @textComponentBackground Spinner.background = @componentBackground
Spinner.buttonBackground = darken($Spinner.background,2%) Spinner.buttonBackground = darken($Spinner.background,2%)
Spinner.buttonSeparatorColor = $Component.borderColor Spinner.buttonSeparatorColor = $Component.borderColor
Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor
@@ -554,7 +554,7 @@ Spinner.buttonArrowColor = @buttonArrowColor
Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor
Spinner.buttonHoverArrowColor = @buttonHoverArrowColor Spinner.buttonHoverArrowColor = @buttonHoverArrowColor
Spinner.buttonPressedArrowColor = @buttonPressedArrowColor Spinner.buttonPressedArrowColor = @buttonPressedArrowColor
Spinner.padding = @textComponentMargin Spinner.padding = @componentMargin
Spinner.editorBorderPainted = false Spinner.editorBorderPainted = false
# allowed values: button or none # allowed values: button or none
Spinner.buttonStyle = button Spinner.buttonStyle = button
@@ -594,7 +594,7 @@ TabbedPane.tabAreaInsets = 0,0,0,0
TabbedPane.selectedTabPadInsets = 0,0,0,0 TabbedPane.selectedTabPadInsets = 0,0,0,0
TabbedPane.tabRunOverlay = 0 TabbedPane.tabRunOverlay = 0
TabbedPane.tabsOverlapBorder = false TabbedPane.tabsOverlapBorder = false
TabbedPane.disabledForeground = @disabledText TabbedPane.disabledForeground = @disabledForeground
TabbedPane.shadow = @background TabbedPane.shadow = @background
TabbedPane.contentBorderInsets = null TabbedPane.contentBorderInsets = null
# allowed values: moreTabsButton or arrowButtons # allowed values: moreTabsButton or arrowButtons
@@ -647,7 +647,7 @@ Table.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Focu
Table.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Selected Table.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Selected
Table.focusCellBackground = $Table.background Table.focusCellBackground = $Table.background
Table.focusCellForeground = $Table.foreground Table.focusCellForeground = $Table.foreground
Table.background = @textComponentBackground Table.background = @componentBackground
Table.selectionInactiveBackground = @selectionInactiveBackground Table.selectionInactiveBackground = @selectionInactiveBackground
Table.selectionInactiveForeground = @selectionInactiveForeground Table.selectionInactiveForeground = @selectionInactiveForeground
Table.dropCellBackground = @dropCellBackground Table.dropCellBackground = @dropCellBackground
@@ -662,15 +662,15 @@ TableHeader.height = 25
TableHeader.cellBorder = com.formdev.flatlaf.ui.FlatTableHeaderBorder TableHeader.cellBorder = com.formdev.flatlaf.ui.FlatTableHeaderBorder
TableHeader.cellMargins = 2,3,2,3 TableHeader.cellMargins = 2,3,2,3
TableHeader.focusCellBackground = $TableHeader.background TableHeader.focusCellBackground = $TableHeader.background
TableHeader.background = @textComponentBackground TableHeader.background = @componentBackground
TableHeader.showTrailingVerticalLine = false TableHeader.showTrailingVerticalLine = false
#---- TextArea ---- #---- TextArea ----
TextArea.border = com.formdev.flatlaf.ui.FlatMarginBorder TextArea.border = com.formdev.flatlaf.ui.FlatMarginBorder
TextArea.margin = @textComponentMargin TextArea.margin = @componentMargin
TextArea.background = @textComponentBackground TextArea.background = @componentBackground
#---- TextComponent ---- #---- TextComponent ----
@@ -684,17 +684,17 @@ TextComponent.arc = 0
#---- TextField ---- #---- TextField ----
TextField.border = com.formdev.flatlaf.ui.FlatTextBorder TextField.border = com.formdev.flatlaf.ui.FlatTextBorder
TextField.margin = @textComponentMargin TextField.margin = @componentMargin
TextField.background = @textComponentBackground TextField.background = @componentBackground
TextField.placeholderForeground = @disabledText TextField.placeholderForeground = @disabledForeground
TextField.iconTextGap = 4 TextField.iconTextGap = 4
#---- TextPane ---- #---- TextPane ----
TextPane.border = com.formdev.flatlaf.ui.FlatMarginBorder TextPane.border = com.formdev.flatlaf.ui.FlatMarginBorder
TextPane.margin = @textComponentMargin TextPane.margin = @componentMargin
TextPane.background = @textComponentBackground TextPane.background = @componentBackground
#---- TitledBorder ---- #---- TitledBorder ----
@@ -724,7 +724,7 @@ TitlePane.restoreIcon = com.formdev.flatlaf.icons.FlatWindowRestoreIcon
TitlePane.background = $MenuBar.background TitlePane.background = $MenuBar.background
TitlePane.inactiveBackground = $TitlePane.background TitlePane.inactiveBackground = $TitlePane.background
TitlePane.foreground = @foreground TitlePane.foreground = @foreground
TitlePane.inactiveForeground = @disabledText TitlePane.inactiveForeground = @disabledForeground
TitlePane.closeHoverBackground = #e81123 TitlePane.closeHoverBackground = #e81123
TitlePane.closePressedBackground = fade($TitlePane.closeHoverBackground,60%) TitlePane.closePressedBackground = fade($TitlePane.closeHoverBackground,60%)
@@ -783,7 +783,7 @@ ToolTipManager.enableToolTipMode = activeApplication
Tree.border = 1,1,1,1 Tree.border = 1,1,1,1
Tree.editorBorder = 1,1,1,1,@cellFocusColor Tree.editorBorder = 1,1,1,1,@cellFocusColor
Tree.background = @textComponentBackground Tree.background = @componentBackground
Tree.selectionInactiveBackground = @selectionInactiveBackground Tree.selectionInactiveBackground = @selectionInactiveBackground
Tree.selectionInactiveForeground = @selectionInactiveForeground Tree.selectionInactiveForeground = @selectionInactiveForeground
Tree.textBackground = $Tree.background Tree.textBackground = $Tree.background

15
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -35,11 +35,12 @@
# general background and foreground (text color) # general background and foreground (text color)
@background = #f2f2f2 @background = #f2f2f2
@foreground = #000 @foreground = #000
@disabledText = tint(@foreground,55%) @disabledBackground = @background
@disabledForeground = tint(@foreground,55%)
# component background # component background
@buttonBackground = lighten(@background,5%) @buttonBackground = lighten(@background,5%)
@textComponentBackground = lighten(@background,5%) @componentBackground = lighten(@background,5%)
@menuBackground = lighten(@background,5%) @menuBackground = lighten(@background,5%)
# selection # selection
@@ -139,7 +140,7 @@ CheckBox.icon.checkmarkColor = @accentCheckmarkColor
# disabled # disabled
CheckBox.icon.disabledBorderColor = tint($CheckBox.icon.borderColor,20%) CheckBox.icon.disabledBorderColor = tint($CheckBox.icon.borderColor,20%)
CheckBox.icon.disabledBackground = @background CheckBox.icon.disabledBackground = @disabledBackground
CheckBox.icon.disabledCheckmarkColor = shade(@background,30%) CheckBox.icon.disabledCheckmarkColor = shade(@background,30%)
# focused # focused
@@ -207,7 +208,7 @@ HelpButton.disabledQuestionMarkColor = shade(@background,30%)
InternalFrame.activeTitleBackground = #fff InternalFrame.activeTitleBackground = #fff
InternalFrame.activeTitleForeground = @foreground InternalFrame.activeTitleForeground = @foreground
InternalFrame.inactiveTitleBackground = darken($InternalFrame.activeTitleBackground,2%) InternalFrame.inactiveTitleBackground = darken($InternalFrame.activeTitleBackground,2%)
InternalFrame.inactiveTitleForeground = @disabledText InternalFrame.inactiveTitleForeground = @disabledForeground
InternalFrame.activeBorderColor = shade(@background,40%) InternalFrame.activeBorderColor = shade(@background,40%)
InternalFrame.inactiveBorderColor = shade(@background,20%) InternalFrame.inactiveBorderColor = shade(@background,20%)
@@ -261,7 +262,7 @@ PopupMenu.borderColor = shade(@background,28%)
ProgressBar.background = darken(@background,13%) ProgressBar.background = darken(@background,13%)
ProgressBar.foreground = @accentSliderColor ProgressBar.foreground = @accentSliderColor
ProgressBar.selectionBackground = @foreground ProgressBar.selectionBackground = @foreground
ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @textComponentBackground) ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @componentBackground)
#---- RootPane ---- #---- RootPane ----
@@ -291,7 +292,7 @@ Separator.foreground = shade(@background,15%)
Slider.trackValueColor = @accentSliderColor Slider.trackValueColor = @accentSliderColor
Slider.trackColor = darken(@background,18%) Slider.trackColor = darken(@background,18%)
Slider.thumbColor = $Slider.trackValueColor Slider.thumbColor = $Slider.trackValueColor
Slider.tickColor = @disabledText Slider.tickColor = @disabledForeground
Slider.focusedColor = fade($Component.focusColor,50%,derived) Slider.focusedColor = fade($Component.focusColor,50%,derived)
Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived) Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived)
Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived) Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived)
@@ -316,7 +317,7 @@ TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived)
TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived) TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived)
TabbedPane.closeBackground = null TabbedPane.closeBackground = null
TabbedPane.closeForeground = @disabledText TabbedPane.closeForeground = @disabledForeground
TabbedPane.closeHoverBackground = darken($TabbedPane.background,20%,derived) TabbedPane.closeHoverBackground = darken($TabbedPane.background,20%,derived)
TabbedPane.closeHoverForeground = @foreground TabbedPane.closeHoverForeground = @foreground
TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived) TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived)

12
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties
View File

@@ -28,19 +28,19 @@ JXHeader.startBackground = #4c5052
#---- HighlighterFactory ---- #---- HighlighterFactory ----
UIColorHighlighter.stripingBackground = lighten(@textComponentBackground,5%) UIColorHighlighter.stripingBackground = lighten(@componentBackground,5%)
#---- Hyperlink ---- #---- Hyperlink ----
Hyperlink.linkColor = $Component.linkColor Hyperlink.linkColor = $Component.linkColor
Hyperlink.visitedColor = $Hyperlink.linkColor Hyperlink.visitedColor = $Hyperlink.linkColor
Hyperlink.disabledText = @disabledText Hyperlink.disabledText = @disabledForeground
#---- MonthView ---- #---- MonthView ----
JXMonthView.background = @textComponentBackground JXMonthView.background = @componentBackground
JXMonthView.monthStringBackground = #4c5052 JXMonthView.monthStringBackground = #4c5052
JXMonthView.monthStringForeground = @foreground JXMonthView.monthStringForeground = @foreground
JXMonthView.daysOfTheWeekForeground = #aaa JXMonthView.daysOfTheWeekForeground = #aaa
@@ -48,10 +48,10 @@ JXMonthView.weekOfTheYearForeground = #888
JXMonthView.unselectableDayForeground = #E05555 JXMonthView.unselectableDayForeground = #E05555
JXMonthView.selectedBackground = @selectionBackground JXMonthView.selectedBackground = @selectionBackground
JXMonthView.flaggedDayForeground = #E05555 JXMonthView.flaggedDayForeground = #E05555
JXMonthView.leadingDayForeground = @disabledText JXMonthView.leadingDayForeground = @disabledForeground
JXMonthView.trailingDayForeground = @disabledText JXMonthView.trailingDayForeground = @disabledForeground
JXMonthView.arrowColor = @foreground JXMonthView.arrowColor = @foreground
JXMonthView.disabledArrowColor = @disabledText JXMonthView.disabledArrowColor = @disabledForeground
#---- TaskPaneContainer ---- #---- TaskPaneContainer ----

12
flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties
View File

@@ -28,19 +28,19 @@ JXHeader.startBackground = #fff
#---- HighlighterFactory ---- #---- HighlighterFactory ----
UIColorHighlighter.stripingBackground = darken(@textComponentBackground,5%) UIColorHighlighter.stripingBackground = darken(@componentBackground,5%)
#---- Hyperlink ---- #---- Hyperlink ----
Hyperlink.linkColor = $Component.linkColor Hyperlink.linkColor = $Component.linkColor
Hyperlink.visitedColor = $Hyperlink.linkColor Hyperlink.visitedColor = $Hyperlink.linkColor
Hyperlink.disabledText = @disabledText Hyperlink.disabledText = @disabledForeground
#---- MonthView ---- #---- MonthView ----
JXMonthView.background = @textComponentBackground JXMonthView.background = @componentBackground
JXMonthView.monthStringBackground = #dfdfdf JXMonthView.monthStringBackground = #dfdfdf
JXMonthView.monthStringForeground = @foreground JXMonthView.monthStringForeground = @foreground
JXMonthView.daysOfTheWeekForeground = #444 JXMonthView.daysOfTheWeekForeground = #444
@@ -48,10 +48,10 @@ JXMonthView.weekOfTheYearForeground = #666
JXMonthView.unselectableDayForeground = #E02222 JXMonthView.unselectableDayForeground = #E02222
JXMonthView.selectedBackground = changeLightness(@selectionBackground,85%) JXMonthView.selectedBackground = changeLightness(@selectionBackground,85%)
JXMonthView.flaggedDayForeground = #E02222 JXMonthView.flaggedDayForeground = #E02222
JXMonthView.leadingDayForeground = @disabledText JXMonthView.leadingDayForeground = @disabledForeground
JXMonthView.trailingDayForeground = @disabledText JXMonthView.trailingDayForeground = @disabledForeground
JXMonthView.arrowColor = @foreground JXMonthView.arrowColor = @foreground
JXMonthView.disabledArrowColor = @disabledText JXMonthView.disabledArrowColor = @disabledForeground
#---- TaskPaneContainer ---- #---- TaskPaneContainer ----

17
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties
View File

@@ -16,19 +16,29 @@
#---- variables ---- #---- variables ----
# general background and foreground (text color)
@background = #cfc @background = #cfc
@foreground = #f00 @foreground = #f00
@disabledBackground = #e0e0e0
@disabledForeground = #008
# component background
@componentBackground = #fff
@menuBackground = #fff
# selection
@selectionBackground = #0a0 @selectionBackground = #0a0
@selectionForeground = #ff0 @selectionForeground = #ff0
@selectionInactiveBackground = #888 @selectionInactiveBackground = #888
@selectionInactiveForeground = #fff @selectionInactiveForeground = #fff
@disabledText = #008
@textComponentBackground = #fff # menu
@menuBackground = #fff
@menuHoverBackground = darken(@menuBackground,10%) @menuHoverBackground = darken(@menuBackground,10%)
@menuCheckBackground = #ccf @menuCheckBackground = #ccf
@menuAcceleratorForeground = #f88 @menuAcceleratorForeground = #f88
@menuAcceleratorSelectionForeground = #fff @menuAcceleratorSelectionForeground = #fff
# misc
@cellFocusColor = #f00 @cellFocusColor = #f00
@icon = #afafaf @icon = #afafaf
@@ -51,7 +61,6 @@
*.caretForeground = #00f *.caretForeground = #00f
*.inactiveBackground = #f0f0f0 *.inactiveBackground = #f0f0f0
*.inactiveForeground = #008 *.inactiveForeground = #008
*.disabledBackground = #e0e0e0
#---- system colors ---- #---- system colors ----

2
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties
View File

@@ -37,7 +37,7 @@ Hyperlink.disabledText = #008
#---- MonthView ---- #---- MonthView ----
JXMonthView.background = @textComponentBackground JXMonthView.background = @componentBackground
JXMonthView.monthStringBackground = #0f0 JXMonthView.monthStringBackground = #0f0
JXMonthView.monthStringForeground = #00f JXMonthView.monthStringForeground = #00f
JXMonthView.daysOfTheWeekForeground = #0f0 JXMonthView.daysOfTheWeekForeground = #0f0

2
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatDarkLaf.properties
View File

@@ -52,7 +52,7 @@ FlatThemeEditorPane.style.comment.italic = true
FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background
FlatThemeEditorPane.gutter.borderColor = $Component.borderColor FlatThemeEditorPane.gutter.borderColor = $Component.borderColor
FlatThemeEditorPane.gutter.lineNumberColor = @disabledText FlatThemeEditorPane.gutter.lineNumberColor = @disabledForeground
#---- FlatThemeEditorPane.errorstrip ---- #---- FlatThemeEditorPane.errorstrip ----

2
flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLightLaf.properties
View File

@@ -52,7 +52,7 @@ FlatThemeEditorPane.style.comment.italic = true
FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background
FlatThemeEditorPane.gutter.borderColor = $Component.borderColor FlatThemeEditorPane.gutter.borderColor = $Component.borderColor
FlatThemeEditorPane.gutter.lineNumberColor = @disabledText FlatThemeEditorPane.gutter.lineNumberColor = @disabledForeground
#---- FlatThemeEditorPane.errorstrip ---- #---- FlatThemeEditorPane.errorstrip ----