mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2026-02-11 14:37:13 -06:00
Theming improvements:
- reworked core themes - reduced explicit colors by using color functions - made it easier to create new themes - avoid using colors from one component type for another component type (except when useful; e.g. `Separator.foreground` is also used for other separators) - HelpButton: use colors from Button (instead of from CheckBox.icon) - ToolBar: improved "docking" and "floating" colors
This commit is contained in:
Karl Tauber
@@ -514,7 +514,7 @@ class UIDefaultsLoader
|
||||
private static Object parseBorder( String value, Function<String, String> resolver, List<ClassLoader> addonClassLoaders ) {
|
||||
if( value.indexOf( ',' ) >= 0 ) {
|
||||
// top,left,bottom,right[,lineColor[,lineThickness]]
|
||||
List<String> parts = StringUtils.split( value, ',', true, false );
|
||||
List<String> parts = splitFunctionParams( value, ',' );
|
||||
Insets insets = parseInsets( value );
|
||||
ColorUIResource lineColor = (parts.size() >= 5)
|
||||
? (ColorUIResource) parseColorOrFunction( resolver.apply( parts.get( 4 ) ), resolver, true )
|
||||
|
||||
@@ -59,7 +59,7 @@ Component.arrowType = triangle
|
||||
|
||||
#---- ProgressBar ----
|
||||
|
||||
ProgressBar.foreground = #a0a0a0
|
||||
ProgressBar.foreground = darken(@foreground,10%)
|
||||
ProgressBar.selectionForeground = @background
|
||||
|
||||
|
||||
|
||||
@@ -35,18 +35,19 @@
|
||||
@background = #3c3f41
|
||||
@foreground = #bbb
|
||||
@selectionBackground = @accentSelectionBackground
|
||||
@selectionForeground = contrast(@selectionBackground,@background,@foreground,25%)
|
||||
@selectionForeground = contrast(@selectionBackground, @background, @foreground, 25%)
|
||||
@selectionInactiveBackground = spin(saturate(shade(@selectionBackground,70%),20%),-15)
|
||||
@selectionInactiveForeground = @foreground
|
||||
@disabledText = #888
|
||||
@textComponentBackground = #45494A
|
||||
@disabledText = shade(@foreground,25%)
|
||||
@buttonBackground = tint(@background,9%)
|
||||
@textComponentBackground = tint(@background,5%)
|
||||
@menuBackground = darken(@background,5%)
|
||||
@menuHoverBackground = lighten(@menuBackground,10%,derived)
|
||||
@menuCheckBackground = darken(@selectionBackground,10%,derived noAutoInverse)
|
||||
@menuAcceleratorForeground = darken(@foreground,15%)
|
||||
@menuAcceleratorSelectionForeground = @selectionForeground
|
||||
@cellFocusColor = #000
|
||||
@icon = #adadad
|
||||
@icon = shade(@foreground,7%)
|
||||
|
||||
# accent colors (blueish)
|
||||
# set @accentColor to use single accent color or
|
||||
@@ -63,7 +64,7 @@
|
||||
@accentButtonDefaultBackground = if(@accentColor, @accentColor, darken(spin(@accentBaseColor,-8),13%))
|
||||
|
||||
# for buttons within components (e.g. combobox or spinner)
|
||||
@buttonArrowColor = #9A9DA1
|
||||
@buttonArrowColor = shade(@foreground,17%)
|
||||
@buttonDisabledArrowColor = darken(@buttonArrowColor,25%)
|
||||
@buttonHoverArrowColor = lighten(@buttonArrowColor,10%,derived noAutoInverse)
|
||||
@buttonPressedArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
|
||||
@@ -86,11 +87,11 @@ controlDkShadow = lighten($controlShadow,10%)
|
||||
|
||||
#---- Button ----
|
||||
|
||||
Button.background = #4c5052
|
||||
Button.background = @buttonBackground
|
||||
Button.hoverBackground = lighten($Button.background,3%,derived)
|
||||
Button.pressedBackground = lighten($Button.background,6%,derived)
|
||||
Button.selectedBackground = lighten($Button.background,10%,derived)
|
||||
Button.selectedForeground = @foreground
|
||||
Button.selectedForeground = $Button.foreground
|
||||
Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
|
||||
|
||||
Button.borderColor = tint($Button.background,10%)
|
||||
@@ -101,7 +102,7 @@ Button.hoverBorderColor = $Button.focusedBorderColor
|
||||
Button.innerFocusWidth = 1
|
||||
|
||||
Button.default.background = @accentButtonDefaultBackground
|
||||
Button.default.foreground = contrast($Button.default.background,@background,@foreground,25%)
|
||||
Button.default.foreground = contrast($Button.default.background, @background, $Button.foreground, 25%)
|
||||
Button.default.hoverBackground = lighten($Button.default.background,3%,derived)
|
||||
Button.default.pressedBackground = lighten($Button.default.background,6%,derived)
|
||||
Button.default.borderColor = tint($Button.default.background,15%)
|
||||
@@ -118,16 +119,16 @@ Button.toolbar.selectedBackground = lighten($Button.background,7%,derived)
|
||||
#---- CheckBox ----
|
||||
|
||||
# enabled
|
||||
CheckBox.icon.borderColor = #6B6B6B
|
||||
CheckBox.icon.background = #43494A
|
||||
CheckBox.icon.borderColor = tint($Component.borderColor,5%)
|
||||
CheckBox.icon.background = tint(@background,5%)
|
||||
CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
|
||||
CheckBox.icon.selectedBackground = $CheckBox.icon.background
|
||||
CheckBox.icon.checkmarkColor = #A7A7A7
|
||||
CheckBox.icon.checkmarkColor = shade(@foreground,10%)
|
||||
|
||||
# disabled
|
||||
CheckBox.icon.disabledBorderColor = #545556
|
||||
CheckBox.icon.disabledBorderColor = shade($CheckBox.icon.borderColor,20%)
|
||||
CheckBox.icon.disabledBackground = @background
|
||||
CheckBox.icon.disabledCheckmarkColor = #606060
|
||||
CheckBox.icon.disabledCheckmarkColor = darken($CheckBox.icon.checkmarkColor,25%)
|
||||
|
||||
# focused
|
||||
CheckBox.icon.focusedBorderColor = $Component.focusedBorderColor
|
||||
@@ -152,14 +153,9 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se
|
||||
CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,6%,derived)
|
||||
|
||||
|
||||
#---- ComboBox ----
|
||||
|
||||
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
|
||||
|
||||
|
||||
#---- Component ----
|
||||
|
||||
Component.borderColor = #646464
|
||||
Component.borderColor = tint(@background,19%)
|
||||
Component.disabledBorderColor = $Component.borderColor
|
||||
Component.focusedBorderColor = lighten($Component.focusColor,5%)
|
||||
Component.focusColor = @accentFocusColor
|
||||
@@ -184,11 +180,17 @@ Desktop.background = #3E434C
|
||||
DesktopIcon.background = lighten($Desktop.background,10%,derived)
|
||||
|
||||
|
||||
#---- HelpButton ----
|
||||
|
||||
HelpButton.questionMarkColor = shade(@foreground,10%)
|
||||
HelpButton.disabledQuestionMarkColor = tint(@background,30%)
|
||||
|
||||
|
||||
#---- InternalFrame ----
|
||||
|
||||
InternalFrame.activeTitleBackground = darken(@background,10%)
|
||||
InternalFrame.activeTitleForeground = @foreground
|
||||
InternalFrame.inactiveTitleBackground = darken(@background,5%)
|
||||
InternalFrame.inactiveTitleBackground = lighten($InternalFrame.activeTitleBackground,5%)
|
||||
InternalFrame.inactiveTitleForeground = @disabledText
|
||||
|
||||
InternalFrame.activeBorderColor = darken(@background,7%)
|
||||
@@ -207,19 +209,19 @@ InternalFrame.inactiveDropShadowOpacity = 0.75
|
||||
|
||||
#---- Menu ----
|
||||
|
||||
Menu.icon.arrowColor = #A7A7A7
|
||||
Menu.icon.disabledArrowColor = #606060
|
||||
Menu.icon.arrowColor = @buttonArrowColor
|
||||
Menu.icon.disabledArrowColor = @buttonDisabledArrowColor
|
||||
|
||||
|
||||
#---- MenuBar ----
|
||||
|
||||
MenuBar.borderColor = #515151
|
||||
MenuBar.borderColor = $Separator.foreground
|
||||
|
||||
|
||||
#---- MenuItemCheckBox ----
|
||||
|
||||
MenuItemCheckBox.icon.checkmarkColor = #A7A7A7
|
||||
MenuItemCheckBox.icon.disabledCheckmarkColor = #606060
|
||||
MenuItemCheckBox.icon.checkmarkColor = @buttonArrowColor
|
||||
MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
|
||||
|
||||
|
||||
#---- PasswordField ----
|
||||
@@ -235,15 +237,15 @@ Popup.dropShadowOpacity = 0.25
|
||||
|
||||
#---- PopupMenu ----
|
||||
|
||||
PopupMenu.borderColor = #5e5e5e
|
||||
PopupMenu.borderColor = tint(@background,17%)
|
||||
|
||||
|
||||
#---- ProgressBar ----
|
||||
|
||||
ProgressBar.background = #555
|
||||
ProgressBar.background = lighten(@background,8%)
|
||||
ProgressBar.foreground = @accentSliderColor
|
||||
ProgressBar.selectionBackground = @foreground
|
||||
ProgressBar.selectionForeground = contrast($ProgressBar.foreground,@background,@foreground,25%)
|
||||
ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @background, @foreground, 25%)
|
||||
|
||||
|
||||
#---- RootPane ----
|
||||
@@ -265,34 +267,34 @@ ScrollBar.pressedButtonBackground = lighten(@background,10%,derived noAutoInvers
|
||||
|
||||
#---- Separator ----
|
||||
|
||||
Separator.foreground = #515151
|
||||
Separator.foreground = tint(@background,10%)
|
||||
|
||||
|
||||
#---- Slider ----
|
||||
|
||||
Slider.trackValueColor = @accentSliderColor
|
||||
Slider.trackColor = #646464
|
||||
Slider.trackColor = lighten(@background,15%)
|
||||
Slider.thumbColor = $Slider.trackValueColor
|
||||
Slider.tickColor = #888
|
||||
Slider.tickColor = @disabledText
|
||||
Slider.focusedColor = fade($Component.focusColor,70%,derived)
|
||||
Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived)
|
||||
Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived)
|
||||
Slider.disabledTrackColor = #4c5052
|
||||
Slider.disabledTrackColor = lighten(@background,10%)
|
||||
Slider.disabledThumbColor = $Slider.disabledTrackColor
|
||||
|
||||
|
||||
#---- SplitPane ----
|
||||
|
||||
SplitPaneDivider.draggingColor = #646464
|
||||
SplitPaneDivider.draggingColor = $Component.borderColor
|
||||
|
||||
|
||||
#---- TabbedPane ----
|
||||
|
||||
TabbedPane.underlineColor = @accentUnderlineColor
|
||||
TabbedPane.disabledUnderlineColor = #7a7a7a
|
||||
TabbedPane.disabledUnderlineColor = lighten(@background,23%)
|
||||
TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse)
|
||||
TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,25%)
|
||||
TabbedPane.contentAreaColor = #646464
|
||||
TabbedPane.contentAreaColor = $Component.borderColor
|
||||
|
||||
TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAutoInverse)
|
||||
TabbedPane.buttonPressedBackground = darken($TabbedPane.background,8%,derived noAutoInverse)
|
||||
@@ -334,7 +336,7 @@ ToggleButton.toolbar.selectedBackground = lighten($ToggleButton.background,7%,de
|
||||
#---- ToolTip ----
|
||||
|
||||
ToolTip.border = 4,6,4,6
|
||||
ToolTip.background = #1e2123
|
||||
ToolTip.background = shade(@background,50%)
|
||||
|
||||
|
||||
#---- Tree ----
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
Button.focusedBackground = null
|
||||
|
||||
Button.default.background = @accentButtonDefaultBackground
|
||||
Button.default.foreground = contrast($Button.default.background,lighten(@foreground,50%),#fff,50%)
|
||||
Button.default.foreground = contrast($Button.default.background, tint($Button.foreground,50%), #fff, 50%)
|
||||
Button.default.focusedBackground = null
|
||||
Button.default.borderColor = shade($Button.default.background,15%)
|
||||
Button.default.hoverBorderColor = tint($Button.default.background,50%)
|
||||
@@ -54,6 +54,7 @@ Button.default.borderWidth = 1
|
||||
#---- CheckBox ----
|
||||
|
||||
CheckBox.icon.style = filled
|
||||
CheckBox.icon.focusedBackground = null
|
||||
|
||||
|
||||
#---- Component ----
|
||||
|
||||
@@ -205,7 +205,7 @@ ColorChooser.swatchesDefaultRecentColor = $control
|
||||
#---- ComboBox ----
|
||||
|
||||
ComboBox.border = com.formdev.flatlaf.ui.FlatRoundBorder
|
||||
ComboBox.padding = 2,6,2,6
|
||||
ComboBox.padding = @textComponentMargin
|
||||
ComboBox.minimumWidth = 72
|
||||
ComboBox.editorColumns = 0
|
||||
ComboBox.maximumRowCount = 15
|
||||
@@ -213,7 +213,8 @@ ComboBox.maximumRowCount = 15
|
||||
# allowed values: auto, button or none
|
||||
ComboBox.buttonStyle = auto
|
||||
ComboBox.background = @textComponentBackground
|
||||
ComboBox.buttonBackground = @textComponentBackground
|
||||
ComboBox.buttonBackground = $ComboBox.background
|
||||
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
|
||||
ComboBox.buttonSeparatorColor = $Component.borderColor
|
||||
ComboBox.buttonDisabledSeparatorColor = $Component.disabledBorderColor
|
||||
ComboBox.buttonArrowColor = @buttonArrowColor
|
||||
@@ -281,17 +282,15 @@ FormattedTextField.iconTextGap = 4
|
||||
#---- HelpButton ----
|
||||
|
||||
HelpButton.icon = com.formdev.flatlaf.icons.FlatHelpButtonIcon
|
||||
HelpButton.borderColor = $CheckBox.icon.borderColor
|
||||
HelpButton.disabledBorderColor = $CheckBox.icon.disabledBorderColor
|
||||
HelpButton.focusedBorderColor = $CheckBox.icon.focusedBorderColor
|
||||
HelpButton.hoverBorderColor = $?CheckBox.icon.hoverBorderColor
|
||||
HelpButton.background = $CheckBox.icon.background
|
||||
HelpButton.disabledBackground = $CheckBox.icon.disabledBackground
|
||||
HelpButton.borderColor = $Button.borderColor
|
||||
HelpButton.disabledBorderColor = $Button.disabledBorderColor
|
||||
HelpButton.focusedBorderColor = $Button.focusedBorderColor
|
||||
HelpButton.hoverBorderColor = $?Button.hoverBorderColor
|
||||
HelpButton.background = $Button.background
|
||||
HelpButton.disabledBackground = $Button.disabledBackground
|
||||
HelpButton.focusedBackground = $?Button.focusedBackground
|
||||
HelpButton.hoverBackground = $?CheckBox.icon.hoverBackground
|
||||
HelpButton.pressedBackground = $?CheckBox.icon.pressedBackground
|
||||
HelpButton.questionMarkColor = $CheckBox.icon.checkmarkColor
|
||||
HelpButton.disabledQuestionMarkColor = $CheckBox.icon.disabledCheckmarkColor
|
||||
HelpButton.hoverBackground = $?Button.hoverBackground
|
||||
HelpButton.pressedBackground = $?Button.pressedBackground
|
||||
|
||||
HelpButton.borderWidth = $?Button.borderWidth
|
||||
HelpButton.innerFocusWidth = $?Button.innerFocusWidth
|
||||
@@ -383,7 +382,7 @@ MenuItem.acceleratorDelimiter = -
|
||||
# for MenuItem.selectionType = underline
|
||||
MenuItem.underlineSelectionBackground = @menuHoverBackground
|
||||
MenuItem.underlineSelectionCheckBackground = @menuCheckBackground
|
||||
MenuItem.underlineSelectionColor = $TabbedPane.underlineColor
|
||||
MenuItem.underlineSelectionColor = @accentUnderlineColor
|
||||
MenuItem.underlineSelectionHeight = 3
|
||||
|
||||
|
||||
@@ -548,7 +547,7 @@ Slider.focusWidth = 4
|
||||
|
||||
Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder
|
||||
Spinner.background = @textComponentBackground
|
||||
Spinner.buttonBackground = $ComboBox.buttonEditableBackground
|
||||
Spinner.buttonBackground = darken($Spinner.background,2%)
|
||||
Spinner.buttonSeparatorColor = $Component.borderColor
|
||||
Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor
|
||||
Spinner.buttonArrowColor = @buttonArrowColor
|
||||
@@ -646,8 +645,8 @@ Table.cellFocusColor = @cellFocusColor
|
||||
Table.cellNoFocusBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Default
|
||||
Table.focusCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Focused
|
||||
Table.focusSelectedCellHighlightBorder = com.formdev.flatlaf.ui.FlatTableCellBorder$Selected
|
||||
Table.focusCellBackground = @textComponentBackground
|
||||
Table.focusCellForeground = @foreground
|
||||
Table.focusCellBackground = $Table.background
|
||||
Table.focusCellForeground = $Table.foreground
|
||||
Table.background = @textComponentBackground
|
||||
Table.selectionInactiveBackground = @selectionInactiveBackground
|
||||
Table.selectionInactiveForeground = @selectionInactiveForeground
|
||||
@@ -666,6 +665,7 @@ TableHeader.focusCellBackground = $TableHeader.background
|
||||
TableHeader.background = @textComponentBackground
|
||||
TableHeader.showTrailingVerticalLine = false
|
||||
|
||||
|
||||
#---- TextArea ----
|
||||
|
||||
TextArea.border = com.formdev.flatlaf.ui.FlatMarginBorder
|
||||
@@ -741,7 +741,7 @@ ToggleButton.rollover = true
|
||||
|
||||
ToggleButton.background = $Button.background
|
||||
ToggleButton.pressedBackground = $Button.pressedBackground
|
||||
ToggleButton.selectedForeground = @foreground
|
||||
ToggleButton.selectedForeground = $ToggleButton.foreground
|
||||
|
||||
ToggleButton.toolbar.hoverBackground = $Button.toolbar.hoverBackground
|
||||
ToggleButton.toolbar.pressedBackground = $Button.toolbar.pressedBackground
|
||||
@@ -761,10 +761,10 @@ ToolBar.border = com.formdev.flatlaf.ui.FlatToolBarBorder
|
||||
ToolBar.borderMargins = 2,2,2,2
|
||||
ToolBar.isRollover = true
|
||||
ToolBar.gripColor = @icon
|
||||
ToolBar.dockingBackground = @background
|
||||
ToolBar.dockingForeground = @foreground
|
||||
ToolBar.floatingBackground = @background
|
||||
ToolBar.floatingForeground = @disabledText
|
||||
ToolBar.dockingBackground = darken($ToolBar.background,5%)
|
||||
ToolBar.dockingForeground = $Component.borderColor
|
||||
ToolBar.floatingBackground = $ToolBar.background
|
||||
ToolBar.floatingForeground = $Component.borderColor
|
||||
|
||||
ToolBar.separatorSize = null
|
||||
ToolBar.separatorWidth = 7
|
||||
|
||||
@@ -35,18 +35,19 @@
|
||||
@background = #f2f2f2
|
||||
@foreground = #000
|
||||
@selectionBackground = @accentSelectionBackground
|
||||
@selectionForeground = contrast(@selectionBackground,@foreground,#fff)
|
||||
@selectionInactiveBackground = #d4d4d4
|
||||
@selectionForeground = contrast(@selectionBackground, @foreground, #fff)
|
||||
@selectionInactiveBackground = shade(@background,13%)
|
||||
@selectionInactiveForeground = @foreground
|
||||
@disabledText = #8C8C8C
|
||||
@textComponentBackground = #fff
|
||||
@menuBackground = #fff
|
||||
@disabledText = tint(@foreground,55%)
|
||||
@buttonBackground = lighten(@background,5%)
|
||||
@textComponentBackground = lighten(@background,5%)
|
||||
@menuBackground = lighten(@background,5%)
|
||||
@menuHoverBackground = darken(@menuBackground,10%,derived)
|
||||
@menuCheckBackground = lighten(@selectionBackground,40%,derived noAutoInverse)
|
||||
@menuAcceleratorForeground = lighten(@foreground,30%)
|
||||
@menuAcceleratorSelectionForeground = @selectionForeground
|
||||
@cellFocusColor = #000
|
||||
@icon = #afafaf
|
||||
@icon = shade(@background,27%)
|
||||
|
||||
# accent colors (blueish)
|
||||
# set @accentColor to use single accent color or
|
||||
@@ -64,7 +65,7 @@
|
||||
@accentButtonDefaultBorderColor = if(@accentColor, @accentColor, tint(@accentBase2Color,20%))
|
||||
|
||||
# for buttons within components (e.g. combobox or spinner)
|
||||
@buttonArrowColor = #666
|
||||
@buttonArrowColor = tint(@foreground,40%)
|
||||
@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%)
|
||||
@buttonHoverArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
|
||||
@buttonPressedArrowColor = lighten(@buttonArrowColor,30%,derived noAutoInverse)
|
||||
@@ -87,12 +88,12 @@ controlDkShadow = darken($controlShadow,15%)
|
||||
|
||||
#---- Button ----
|
||||
|
||||
Button.background = #fff
|
||||
Button.focusedBackground = changeLightness(@selectionBackground,95%)
|
||||
Button.background = @buttonBackground
|
||||
Button.focusedBackground = changeLightness($Component.focusColor,95%)
|
||||
Button.hoverBackground = darken($Button.background,3%,derived)
|
||||
Button.pressedBackground = darken($Button.background,10%,derived)
|
||||
Button.selectedBackground = darken($Button.background,20%,derived)
|
||||
Button.selectedForeground = @foreground
|
||||
Button.selectedForeground = $Button.foreground
|
||||
Button.disabledSelectedBackground = darken($Button.background,13%,derived)
|
||||
|
||||
Button.borderColor = $Component.borderColor
|
||||
@@ -103,7 +104,7 @@ Button.hoverBorderColor = $Button.focusedBorderColor
|
||||
Button.innerFocusWidth = 0
|
||||
|
||||
Button.default.background = $Button.background
|
||||
Button.default.foreground = @foreground
|
||||
Button.default.foreground = $Button.foreground
|
||||
Button.default.focusedBackground = $Button.focusedBackground
|
||||
Button.default.hoverBackground = darken($Button.default.background,3%,derived)
|
||||
Button.default.pressedBackground = darken($Button.default.background,10%,derived)
|
||||
@@ -121,34 +122,34 @@ Button.toolbar.selectedBackground = $Button.selectedBackground
|
||||
#---- CheckBox ----
|
||||
|
||||
# enabled
|
||||
CheckBox.icon.borderColor = #b0b0b0
|
||||
CheckBox.icon.background = #fff
|
||||
CheckBox.icon.borderColor = shade($Component.borderColor,10%)
|
||||
CheckBox.icon.background = @buttonBackground
|
||||
CheckBox.icon.selectedBorderColor = $CheckBox.icon.borderColor
|
||||
CheckBox.icon.selectedBackground = $CheckBox.icon.background
|
||||
CheckBox.icon.checkmarkColor = @accentCheckmarkColor
|
||||
|
||||
# disabled
|
||||
CheckBox.icon.disabledBorderColor = #BDBDBD
|
||||
CheckBox.icon.disabledBorderColor = tint($CheckBox.icon.borderColor,20%)
|
||||
CheckBox.icon.disabledBackground = @background
|
||||
CheckBox.icon.disabledCheckmarkColor = #ABABAB
|
||||
CheckBox.icon.disabledCheckmarkColor = shade(@background,30%)
|
||||
|
||||
# focused
|
||||
CheckBox.icon.focusedBorderColor = shade($Component.focusedBorderColor,10%)
|
||||
CheckBox.icon.focusedBackground = $Button.focusedBackground
|
||||
CheckBox.icon.focusedBackground = changeLightness($Component.focusColor,95%)
|
||||
|
||||
# hover
|
||||
CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
|
||||
CheckBox.icon.hoverBackground = $Button.hoverBackground
|
||||
CheckBox.icon.hoverBackground = darken($CheckBox.icon.background,3%,derived)
|
||||
|
||||
# pressed
|
||||
CheckBox.icon.pressedBackground = $Button.pressedBackground
|
||||
CheckBox.icon.pressedBackground = darken($CheckBox.icon.background,10%,derived)
|
||||
|
||||
|
||||
# used if CheckBox.icon.style = filled
|
||||
# enabled
|
||||
CheckBox.icon[filled].selectedBorderColor = shade($CheckBox.icon[filled].selectedBackground,5%)
|
||||
CheckBox.icon[filled].selectedBackground = @accentCheckmarkColor
|
||||
CheckBox.icon[filled].checkmarkColor = #fff
|
||||
CheckBox.icon[filled].checkmarkColor = @buttonBackground
|
||||
# focused
|
||||
CheckBox.icon[filled].selectedFocusedBorderColor = tint($CheckBox.icon[filled].selectedBackground,50%)
|
||||
CheckBox.icon[filled].selectedFocusedBackground = $CheckBox.icon[filled].selectedBackground
|
||||
@@ -159,15 +160,10 @@ CheckBox.icon[filled].selectedHoverBackground = darken($CheckBox.icon[filled].se
|
||||
CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].selectedBackground,10%,derived)
|
||||
|
||||
|
||||
#---- ComboBox ----
|
||||
|
||||
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
|
||||
|
||||
|
||||
#---- Component ----
|
||||
|
||||
Component.borderColor = #c4c4c4
|
||||
Component.disabledBorderColor = lighten($Component.borderColor,4%)
|
||||
Component.borderColor = shade(@background,20%)
|
||||
Component.disabledBorderColor = tint($Component.borderColor,20%)
|
||||
Component.focusedBorderColor = shade($Component.focusColor,10%)
|
||||
Component.focusColor = @accentFocusColor
|
||||
Component.linkColor = @accentLinkColor
|
||||
@@ -194,17 +190,18 @@ DesktopIcon.background = darken($Desktop.background,10%,derived)
|
||||
#---- HelpButton ----
|
||||
|
||||
HelpButton.questionMarkColor = @accentCheckmarkColor
|
||||
HelpButton.disabledQuestionMarkColor = shade(@background,30%)
|
||||
|
||||
|
||||
#---- InternalFrame ----
|
||||
|
||||
InternalFrame.activeTitleBackground = #fff
|
||||
InternalFrame.activeTitleForeground = @foreground
|
||||
InternalFrame.inactiveTitleBackground = #fafafa
|
||||
InternalFrame.inactiveTitleBackground = darken($InternalFrame.activeTitleBackground,2%)
|
||||
InternalFrame.inactiveTitleForeground = @disabledText
|
||||
|
||||
InternalFrame.activeBorderColor = darken($Component.borderColor,20%)
|
||||
InternalFrame.inactiveBorderColor = $Component.borderColor
|
||||
InternalFrame.activeBorderColor = shade(@background,40%)
|
||||
InternalFrame.inactiveBorderColor = shade(@background,20%)
|
||||
|
||||
InternalFrame.buttonHoverBackground = darken($InternalFrame.activeTitleBackground,10%,derived)
|
||||
InternalFrame.buttonPressedBackground = darken($InternalFrame.activeTitleBackground,20%,derived)
|
||||
@@ -219,19 +216,19 @@ InternalFrame.inactiveDropShadowOpacity = 0.5
|
||||
|
||||
#---- Menu ----
|
||||
|
||||
Menu.icon.arrowColor = #666
|
||||
Menu.icon.disabledArrowColor = #ABABAB
|
||||
Menu.icon.arrowColor = @buttonArrowColor
|
||||
Menu.icon.disabledArrowColor = @buttonDisabledArrowColor
|
||||
|
||||
|
||||
#---- MenuBar ----
|
||||
|
||||
MenuBar.borderColor = #cdcdcd
|
||||
MenuBar.borderColor = $Separator.foreground
|
||||
|
||||
|
||||
#---- MenuItemCheckBox ----
|
||||
|
||||
MenuItemCheckBox.icon.checkmarkColor = @accentCheckmarkColor
|
||||
MenuItemCheckBox.icon.disabledCheckmarkColor = #ABABAB
|
||||
MenuItemCheckBox.icon.disabledCheckmarkColor = @buttonDisabledArrowColor
|
||||
|
||||
|
||||
#---- PasswordField ----
|
||||
@@ -247,15 +244,15 @@ Popup.dropShadowOpacity = 0.15
|
||||
|
||||
#---- PopupMenu ----
|
||||
|
||||
PopupMenu.borderColor = #adadad
|
||||
PopupMenu.borderColor = shade(@background,28%)
|
||||
|
||||
|
||||
#---- ProgressBar ----
|
||||
|
||||
ProgressBar.background = #D1D1D1
|
||||
ProgressBar.background = darken(@background,13%)
|
||||
ProgressBar.foreground = @accentSliderColor
|
||||
ProgressBar.selectionBackground = @foreground
|
||||
ProgressBar.selectionForeground = contrast($ProgressBar.foreground,@foreground,@textComponentBackground)
|
||||
ProgressBar.selectionForeground = contrast($ProgressBar.foreground, @foreground, @textComponentBackground)
|
||||
|
||||
|
||||
#---- RootPane ----
|
||||
@@ -277,34 +274,34 @@ ScrollBar.pressedButtonBackground = darken(@background,10%,derived noAutoInverse
|
||||
|
||||
#---- Separator ----
|
||||
|
||||
Separator.foreground = #d1d1d1
|
||||
Separator.foreground = shade(@background,15%)
|
||||
|
||||
|
||||
#---- Slider ----
|
||||
|
||||
Slider.trackValueColor = @accentSliderColor
|
||||
Slider.trackColor = #c4c4c4
|
||||
Slider.trackColor = darken(@background,18%)
|
||||
Slider.thumbColor = $Slider.trackValueColor
|
||||
Slider.tickColor = #888
|
||||
Slider.tickColor = @disabledText
|
||||
Slider.focusedColor = fade($Component.focusColor,50%,derived)
|
||||
Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived)
|
||||
Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived)
|
||||
Slider.disabledTrackColor = #c0c0c0
|
||||
Slider.disabledTrackColor = darken(@background,13%)
|
||||
Slider.disabledThumbColor = $Slider.disabledTrackColor
|
||||
|
||||
|
||||
#---- SplitPane ----
|
||||
|
||||
SplitPaneDivider.draggingColor = #c4c4c4
|
||||
SplitPaneDivider.draggingColor = $Component.borderColor
|
||||
|
||||
|
||||
#---- TabbedPane ----
|
||||
|
||||
TabbedPane.underlineColor = @accentUnderlineColor
|
||||
TabbedPane.disabledUnderlineColor = #ababab
|
||||
TabbedPane.disabledUnderlineColor = darken(@background,28%)
|
||||
TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived)
|
||||
TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,10%)
|
||||
TabbedPane.contentAreaColor = #bfbfbf
|
||||
TabbedPane.contentAreaColor = $Component.borderColor
|
||||
|
||||
TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived)
|
||||
TabbedPane.buttonPressedBackground = darken($TabbedPane.background,10%,derived)
|
||||
@@ -345,8 +342,8 @@ ToggleButton.toolbar.selectedBackground = $ToggleButton.selectedBackground
|
||||
|
||||
#---- ToolTip ----
|
||||
|
||||
ToolTip.border = 4,6,4,6,$InternalFrame.activeBorderColor
|
||||
ToolTip.background = #fafafa
|
||||
ToolTip.border = 4,6,4,6,shade(@background,40%)
|
||||
ToolTip.background = lighten(@background,3%)
|
||||
|
||||
|
||||
#---- Tree ----
|
||||
|
||||
Reference in New Issue
Block a user