From f0c314df802a9ec1e4e9b78adc34853134fc7768 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sun, 3 Oct 2021 23:15:51 +0200 Subject: [PATCH] Theming improvements: - renamed `@disabledText` to `@disabledForeground` - renamed `@textComponentBackground` to `@componentBackground` - renamed `@textComponentMargin` to `@componentMargin` - added `@disabledBackground` (Note: this are incompatible changes!) --- .../formdev/flatlaf/FlatDarkLaf.properties | 13 ++-- .../com/formdev/flatlaf/FlatLaf.properties | 70 +++++++++---------- .../formdev/flatlaf/FlatLightLaf.properties | 15 ++-- .../flatlaf/swingx/FlatDarkLaf.properties | 12 ++-- .../flatlaf/swingx/FlatLightLaf.properties | 12 ++-- .../flatlaf/testing/FlatTestLaf.properties | 17 +++-- .../testing/swingx/FlatTestLaf.properties | 2 +- .../themeeditor/FlatDarkLaf.properties | 2 +- .../themeeditor/FlatLightLaf.properties | 2 +- 9 files changed, 78 insertions(+), 67 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties index 22e89689..2b00d60d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -35,11 +35,12 @@ # general background and foreground (text color) @background = #3c3f41 @foreground = #bbb -@disabledText = shade(@foreground,25%) +@disabledBackground = @background +@disabledForeground = shade(@foreground,25%) # component background @buttonBackground = tint(@background,9%) -@textComponentBackground = tint(@background,5%) +@componentBackground = tint(@background,5%) @menuBackground = darken(@background,5%) # selection @@ -136,7 +137,7 @@ CheckBox.icon.checkmarkColor = shade(@foreground,10%) # disabled CheckBox.icon.disabledBorderColor = shade($CheckBox.icon.borderColor,20%) -CheckBox.icon.disabledBackground = @background +CheckBox.icon.disabledBackground = @disabledBackground CheckBox.icon.disabledCheckmarkColor = darken($CheckBox.icon.checkmarkColor,25%) # focused @@ -200,7 +201,7 @@ HelpButton.disabledQuestionMarkColor = tint(@background,30%) InternalFrame.activeTitleBackground = darken(@background,10%) InternalFrame.activeTitleForeground = @foreground InternalFrame.inactiveTitleBackground = lighten($InternalFrame.activeTitleBackground,5%) -InternalFrame.inactiveTitleForeground = @disabledText +InternalFrame.inactiveTitleForeground = @disabledForeground InternalFrame.activeBorderColor = darken(@background,7%) InternalFrame.inactiveBorderColor = darken(@background,3%) @@ -284,7 +285,7 @@ Separator.foreground = tint(@background,10%) Slider.trackValueColor = @accentSliderColor Slider.trackColor = lighten(@background,15%) Slider.thumbColor = $Slider.trackValueColor -Slider.tickColor = @disabledText +Slider.tickColor = @disabledForeground Slider.focusedColor = fade($Component.focusColor,70%,derived) Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,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.closeBackground = null -TabbedPane.closeForeground = @disabledText +TabbedPane.closeForeground = @disabledForeground TabbedPane.closeHoverBackground = lighten($TabbedPane.background,5%,derived) TabbedPane.closeHoverForeground = @foreground TabbedPane.closePressedBackground = lighten($TabbedPane.background,10%,derived) 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 7938d706..c4ddeb30 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -75,7 +75,7 @@ ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI #---- variables ---- -@textComponentMargin = 2,6,2,6 +@componentMargin = 2,6,2,6 @menuItemMargin = 3,6,3,6 @@ -83,21 +83,21 @@ ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI *.background = @background *.foreground = @foreground -*.caretForeground = @foreground -*.inactiveBackground = @background -*.inactiveForeground = @disabledText +*.disabledBackground = @disabledBackground +*.disabledForeground = @disabledForeground +*.disabledText = @disabledForeground +*.inactiveBackground = @disabledBackground +*.inactiveForeground = @disabledForeground *.selectionBackground = @selectionBackground *.selectionForeground = @selectionForeground -*.disabledBackground = @background -*.disabledForeground = @disabledText -*.disabledText = @disabledText +*.caretForeground = @foreground *.acceleratorForeground = @menuAcceleratorForeground *.acceleratorSelectionForeground = @menuAcceleratorSelectionForeground #---- system colors ---- -desktop = @textComponentBackground +desktop = @componentBackground activeCaptionText = @foreground activeCaptionBorder = $activeCaption inactiveCaptionText = @foreground @@ -107,11 +107,11 @@ windowBorder = @foreground windowText = @foreground menu = @background menuText = @foreground -text = @textComponentBackground +text = @componentBackground textText = @foreground textHighlight = @selectionBackground textHighlightText = @selectionForeground -textInactiveText = @disabledText +textInactiveText = @disabledForeground control = @background controlText = @foreground controlShadow = $Component.borderColor @@ -205,14 +205,14 @@ ColorChooser.swatchesDefaultRecentColor = $control #---- ComboBox ---- ComboBox.border = com.formdev.flatlaf.ui.FlatRoundBorder -ComboBox.padding = @textComponentMargin +ComboBox.padding = @componentMargin ComboBox.minimumWidth = 72 ComboBox.editorColumns = 0 ComboBox.maximumRowCount = 15 [mac]ComboBox.showPopupOnNavigation = true # allowed values: auto, button or none ComboBox.buttonStyle = auto -ComboBox.background = @textComponentBackground +ComboBox.background = @componentBackground ComboBox.buttonBackground = $ComboBox.background ComboBox.buttonEditableBackground = darken($ComboBox.background,2%) ComboBox.buttonSeparatorColor = $Component.borderColor @@ -246,8 +246,8 @@ DesktopIcon.closeIcon = com.formdev.flatlaf.icons.FlatInternalFrameCloseIcon #---- EditorPane ---- EditorPane.border = com.formdev.flatlaf.ui.FlatMarginBorder -EditorPane.margin = @textComponentMargin -EditorPane.background = @textComponentBackground +EditorPane.margin = @componentMargin +EditorPane.background = @componentBackground #---- FileChooser ---- @@ -273,9 +273,9 @@ FileView.floppyDriveIcon = com.formdev.flatlaf.icons.FlatFileViewFloppyDriveIcon #---- FormattedTextField ---- FormattedTextField.border = com.formdev.flatlaf.ui.FlatTextBorder -FormattedTextField.margin = @textComponentMargin -FormattedTextField.background = @textComponentBackground -FormattedTextField.placeholderForeground = @disabledText +FormattedTextField.margin = @componentMargin +FormattedTextField.background = @componentBackground +FormattedTextField.placeholderForeground = @disabledForeground FormattedTextField.iconTextGap = 4 @@ -329,7 +329,7 @@ List.cellFocusColor = @cellFocusColor List.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Default List.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Focused List.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatListCellBorder$Selected -List.background = @textComponentBackground +List.background = @componentBackground List.selectionInactiveBackground = @selectionInactiveBackground List.selectionInactiveForeground = @selectionInactiveForeground List.dropCellBackground = @dropCellBackground @@ -412,9 +412,9 @@ OptionPane.warningIcon = com.formdev.flatlaf.icons.FlatOptionPaneWarningIcon #---- PasswordField ---- PasswordField.border = com.formdev.flatlaf.ui.FlatTextBorder -PasswordField.margin = @textComponentMargin -PasswordField.background = @textComponentBackground -PasswordField.placeholderForeground = @disabledText +PasswordField.margin = @componentMargin +PasswordField.background = @componentBackground +PasswordField.placeholderForeground = @disabledForeground PasswordField.iconTextGap = 4 PasswordField.echoChar = \u2022 PasswordField.showCapsLock = true @@ -546,7 +546,7 @@ Slider.focusWidth = 4 #---- Spinner ---- Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder -Spinner.background = @textComponentBackground +Spinner.background = @componentBackground Spinner.buttonBackground = darken($Spinner.background,2%) Spinner.buttonSeparatorColor = $Component.borderColor Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor @@ -554,7 +554,7 @@ Spinner.buttonArrowColor = @buttonArrowColor Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor Spinner.buttonHoverArrowColor = @buttonHoverArrowColor Spinner.buttonPressedArrowColor = @buttonPressedArrowColor -Spinner.padding = @textComponentMargin +Spinner.padding = @componentMargin Spinner.editorBorderPainted = false # allowed values: button or none Spinner.buttonStyle = button @@ -594,7 +594,7 @@ TabbedPane.tabAreaInsets = 0,0,0,0 TabbedPane.selectedTabPadInsets = 0,0,0,0 TabbedPane.tabRunOverlay = 0 TabbedPane.tabsOverlapBorder = false -TabbedPane.disabledForeground = @disabledText +TabbedPane.disabledForeground = @disabledForeground TabbedPane.shadow = @background TabbedPane.contentBorderInsets = null # 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.focusCellBackground = $Table.background Table.focusCellForeground = $Table.foreground -Table.background = @textComponentBackground +Table.background = @componentBackground Table.selectionInactiveBackground = @selectionInactiveBackground Table.selectionInactiveForeground = @selectionInactiveForeground Table.dropCellBackground = @dropCellBackground @@ -662,15 +662,15 @@ TableHeader.height = 25 TableHeader.cellBorder = com.formdev.flatlaf.ui.FlatTableHeaderBorder TableHeader.cellMargins = 2,3,2,3 TableHeader.focusCellBackground = $TableHeader.background -TableHeader.background = @textComponentBackground +TableHeader.background = @componentBackground TableHeader.showTrailingVerticalLine = false #---- TextArea ---- TextArea.border = com.formdev.flatlaf.ui.FlatMarginBorder -TextArea.margin = @textComponentMargin -TextArea.background = @textComponentBackground +TextArea.margin = @componentMargin +TextArea.background = @componentBackground #---- TextComponent ---- @@ -684,17 +684,17 @@ TextComponent.arc = 0 #---- TextField ---- TextField.border = com.formdev.flatlaf.ui.FlatTextBorder -TextField.margin = @textComponentMargin -TextField.background = @textComponentBackground -TextField.placeholderForeground = @disabledText +TextField.margin = @componentMargin +TextField.background = @componentBackground +TextField.placeholderForeground = @disabledForeground TextField.iconTextGap = 4 #---- TextPane ---- TextPane.border = com.formdev.flatlaf.ui.FlatMarginBorder -TextPane.margin = @textComponentMargin -TextPane.background = @textComponentBackground +TextPane.margin = @componentMargin +TextPane.background = @componentBackground #---- TitledBorder ---- @@ -724,7 +724,7 @@ TitlePane.restoreIcon = com.formdev.flatlaf.icons.FlatWindowRestoreIcon TitlePane.background = $MenuBar.background TitlePane.inactiveBackground = $TitlePane.background TitlePane.foreground = @foreground -TitlePane.inactiveForeground = @disabledText +TitlePane.inactiveForeground = @disabledForeground TitlePane.closeHoverBackground = #e81123 TitlePane.closePressedBackground = fade($TitlePane.closeHoverBackground,60%) @@ -783,7 +783,7 @@ ToolTipManager.enableToolTipMode = activeApplication Tree.border = 1,1,1,1 Tree.editorBorder = 1,1,1,1,@cellFocusColor -Tree.background = @textComponentBackground +Tree.background = @componentBackground Tree.selectionInactiveBackground = @selectionInactiveBackground Tree.selectionInactiveForeground = @selectionInactiveForeground Tree.textBackground = $Tree.background diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties index 3f95a7f9..e5f75f18 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -35,11 +35,12 @@ # general background and foreground (text color) @background = #f2f2f2 @foreground = #000 -@disabledText = tint(@foreground,55%) +@disabledBackground = @background +@disabledForeground = tint(@foreground,55%) # component background @buttonBackground = lighten(@background,5%) -@textComponentBackground = lighten(@background,5%) +@componentBackground = lighten(@background,5%) @menuBackground = lighten(@background,5%) # selection @@ -139,7 +140,7 @@ CheckBox.icon.checkmarkColor = @accentCheckmarkColor # disabled CheckBox.icon.disabledBorderColor = tint($CheckBox.icon.borderColor,20%) -CheckBox.icon.disabledBackground = @background +CheckBox.icon.disabledBackground = @disabledBackground CheckBox.icon.disabledCheckmarkColor = shade(@background,30%) # focused @@ -207,7 +208,7 @@ HelpButton.disabledQuestionMarkColor = shade(@background,30%) InternalFrame.activeTitleBackground = #fff InternalFrame.activeTitleForeground = @foreground InternalFrame.inactiveTitleBackground = darken($InternalFrame.activeTitleBackground,2%) -InternalFrame.inactiveTitleForeground = @disabledText +InternalFrame.inactiveTitleForeground = @disabledForeground InternalFrame.activeBorderColor = shade(@background,40%) InternalFrame.inactiveBorderColor = shade(@background,20%) @@ -261,7 +262,7 @@ PopupMenu.borderColor = shade(@background,28%) ProgressBar.background = darken(@background,13%) ProgressBar.foreground = @accentSliderColor ProgressBar.selectionBackground = @foreground -ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @textComponentBackground) +ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @componentBackground) #---- RootPane ---- @@ -291,7 +292,7 @@ Separator.foreground = shade(@background,15%) Slider.trackValueColor = @accentSliderColor Slider.trackColor = darken(@background,18%) Slider.thumbColor = $Slider.trackValueColor -Slider.tickColor = @disabledText +Slider.tickColor = @disabledForeground Slider.focusedColor = fade($Component.focusColor,50%,derived) Slider.hoverThumbColor = darken($Slider.thumbColor,5%,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.closeBackground = null -TabbedPane.closeForeground = @disabledText +TabbedPane.closeForeground = @disabledForeground TabbedPane.closeHoverBackground = darken($TabbedPane.background,20%,derived) TabbedPane.closeHoverForeground = @foreground TabbedPane.closePressedBackground = darken($TabbedPane.background,25%,derived) diff --git a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties index 6bd0de9d..ca88bfae 100644 --- a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties +++ b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties @@ -28,19 +28,19 @@ JXHeader.startBackground = #4c5052 #---- HighlighterFactory ---- -UIColorHighlighter.stripingBackground = lighten(@textComponentBackground,5%) +UIColorHighlighter.stripingBackground = lighten(@componentBackground,5%) #---- Hyperlink ---- Hyperlink.linkColor = $Component.linkColor Hyperlink.visitedColor = $Hyperlink.linkColor -Hyperlink.disabledText = @disabledText +Hyperlink.disabledText = @disabledForeground #---- MonthView ---- -JXMonthView.background = @textComponentBackground +JXMonthView.background = @componentBackground JXMonthView.monthStringBackground = #4c5052 JXMonthView.monthStringForeground = @foreground JXMonthView.daysOfTheWeekForeground = #aaa @@ -48,10 +48,10 @@ JXMonthView.weekOfTheYearForeground = #888 JXMonthView.unselectableDayForeground = #E05555 JXMonthView.selectedBackground = @selectionBackground JXMonthView.flaggedDayForeground = #E05555 -JXMonthView.leadingDayForeground = @disabledText -JXMonthView.trailingDayForeground = @disabledText +JXMonthView.leadingDayForeground = @disabledForeground +JXMonthView.trailingDayForeground = @disabledForeground JXMonthView.arrowColor = @foreground -JXMonthView.disabledArrowColor = @disabledText +JXMonthView.disabledArrowColor = @disabledForeground #---- TaskPaneContainer ---- diff --git a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties index 4aadeef9..244d3df5 100644 --- a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties +++ b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties @@ -28,19 +28,19 @@ JXHeader.startBackground = #fff #---- HighlighterFactory ---- -UIColorHighlighter.stripingBackground = darken(@textComponentBackground,5%) +UIColorHighlighter.stripingBackground = darken(@componentBackground,5%) #---- Hyperlink ---- Hyperlink.linkColor = $Component.linkColor Hyperlink.visitedColor = $Hyperlink.linkColor -Hyperlink.disabledText = @disabledText +Hyperlink.disabledText = @disabledForeground #---- MonthView ---- -JXMonthView.background = @textComponentBackground +JXMonthView.background = @componentBackground JXMonthView.monthStringBackground = #dfdfdf JXMonthView.monthStringForeground = @foreground JXMonthView.daysOfTheWeekForeground = #444 @@ -48,10 +48,10 @@ JXMonthView.weekOfTheYearForeground = #666 JXMonthView.unselectableDayForeground = #E02222 JXMonthView.selectedBackground = changeLightness(@selectionBackground,85%) JXMonthView.flaggedDayForeground = #E02222 -JXMonthView.leadingDayForeground = @disabledText -JXMonthView.trailingDayForeground = @disabledText +JXMonthView.leadingDayForeground = @disabledForeground +JXMonthView.trailingDayForeground = @disabledForeground JXMonthView.arrowColor = @foreground -JXMonthView.disabledArrowColor = @disabledText +JXMonthView.disabledArrowColor = @disabledForeground #---- TaskPaneContainer ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties index 625d4da1..e1e85ed8 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties @@ -16,19 +16,29 @@ #---- variables ---- +# general background and foreground (text color) @background = #cfc @foreground = #f00 +@disabledBackground = #e0e0e0 +@disabledForeground = #008 + +# component background +@componentBackground = #fff +@menuBackground = #fff + +# selection @selectionBackground = #0a0 @selectionForeground = #ff0 @selectionInactiveBackground = #888 @selectionInactiveForeground = #fff -@disabledText = #008 -@textComponentBackground = #fff -@menuBackground = #fff + +# menu @menuHoverBackground = darken(@menuBackground,10%) @menuCheckBackground = #ccf @menuAcceleratorForeground = #f88 @menuAcceleratorSelectionForeground = #fff + +# misc @cellFocusColor = #f00 @icon = #afafaf @@ -51,7 +61,6 @@ *.caretForeground = #00f *.inactiveBackground = #f0f0f0 *.inactiveForeground = #008 -*.disabledBackground = #e0e0e0 #---- system colors ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties index 60161ae4..e670e7f2 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/swingx/FlatTestLaf.properties @@ -37,7 +37,7 @@ Hyperlink.disabledText = #008 #---- MonthView ---- -JXMonthView.background = @textComponentBackground +JXMonthView.background = @componentBackground JXMonthView.monthStringBackground = #0f0 JXMonthView.monthStringForeground = #00f JXMonthView.daysOfTheWeekForeground = #0f0 diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatDarkLaf.properties b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatDarkLaf.properties index d274c2e0..74e1d1af 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatDarkLaf.properties +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatDarkLaf.properties @@ -52,7 +52,7 @@ FlatThemeEditorPane.style.comment.italic = true FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background FlatThemeEditorPane.gutter.borderColor = $Component.borderColor -FlatThemeEditorPane.gutter.lineNumberColor = @disabledText +FlatThemeEditorPane.gutter.lineNumberColor = @disabledForeground #---- FlatThemeEditorPane.errorstrip ---- diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLightLaf.properties b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLightLaf.properties index 0678c339..07826591 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLightLaf.properties +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLightLaf.properties @@ -52,7 +52,7 @@ FlatThemeEditorPane.style.comment.italic = true FlatThemeEditorPane.gutter.background = $FlatThemeEditorPane.background FlatThemeEditorPane.gutter.borderColor = $Component.borderColor -FlatThemeEditorPane.gutter.lineNumberColor = @disabledText +FlatThemeEditorPane.gutter.lineNumberColor = @disabledForeground #---- FlatThemeEditorPane.errorstrip ----