mirror of
https://github.com/JFormDesigner/FlatLaf.git
synced 2025-12-08 15:00:54 +03:00
UI defaults:
- moved some common properties from FlatLightLaf.properties and FlatDarkLaf.properties to FlatLaf.properties - use color functions for more properties
This commit is contained in:
@@ -36,6 +36,12 @@
|
|||||||
@cellFocusColor = #000
|
@cellFocusColor = #000
|
||||||
@icon = #adadad
|
@icon = #adadad
|
||||||
|
|
||||||
|
# for buttons within components (e.g. combobox or spinner)
|
||||||
|
@buttonArrowColor = #9A9DA1
|
||||||
|
@buttonDisabledArrowColor = darken(@buttonArrowColor,25%)
|
||||||
|
@buttonHoverArrowColor = lighten(@buttonArrowColor,10%,derived noAutoInverse)
|
||||||
|
@buttonPressedArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
|
||||||
|
|
||||||
# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
|
# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
|
||||||
@dropCellBackground = darken(List.selectionBackground,10%,lazy)
|
@dropCellBackground = darken(List.selectionBackground,10%,lazy)
|
||||||
@dropCellForeground = lazy(List.selectionForeground)
|
@dropCellForeground = lazy(List.selectionForeground)
|
||||||
@@ -62,8 +68,8 @@ Button.selectedForeground = @foreground
|
|||||||
Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
|
Button.disabledSelectedBackground = lighten($Button.background,3%,derived)
|
||||||
|
|
||||||
Button.borderColor = #5e6060
|
Button.borderColor = #5e6060
|
||||||
Button.disabledBorderColor = #5e6060
|
Button.disabledBorderColor = $Button.borderColor
|
||||||
Button.focusedBorderColor = #466d94
|
Button.focusedBorderColor = $Component.focusedBorderColor
|
||||||
Button.hoverBorderColor = $Button.focusedBorderColor
|
Button.hoverBorderColor = $Button.focusedBorderColor
|
||||||
|
|
||||||
Button.default.background = #365880
|
Button.default.background = #365880
|
||||||
@@ -119,11 +125,7 @@ CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].
|
|||||||
|
|
||||||
#---- ComboBox ----
|
#---- ComboBox ----
|
||||||
|
|
||||||
ComboBox.buttonEditableBackground = #404445
|
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
|
||||||
ComboBox.buttonArrowColor = #9A9DA1
|
|
||||||
ComboBox.buttonDisabledArrowColor = darken($ComboBox.buttonArrowColor,25%)
|
|
||||||
ComboBox.buttonHoverArrowColor = lighten($ComboBox.buttonArrowColor,10%,derived noAutoInverse)
|
|
||||||
ComboBox.buttonPressedArrowColor = lighten($ComboBox.buttonArrowColor,20%,derived noAutoInverse)
|
|
||||||
|
|
||||||
|
|
||||||
#---- Component ----
|
#---- Component ----
|
||||||
@@ -307,4 +309,4 @@ ToolTip.background = #1e2123
|
|||||||
|
|
||||||
#---- Tree ----
|
#---- Tree ----
|
||||||
|
|
||||||
Tree.hash = #505355
|
Tree.hash = lighten($Tree.background,5%)
|
||||||
|
|||||||
@@ -203,6 +203,10 @@ ComboBox.maximumRowCount = 15
|
|||||||
ComboBox.buttonStyle = auto
|
ComboBox.buttonStyle = auto
|
||||||
ComboBox.background = @textComponentBackground
|
ComboBox.background = @textComponentBackground
|
||||||
ComboBox.buttonBackground = @textComponentBackground
|
ComboBox.buttonBackground = @textComponentBackground
|
||||||
|
ComboBox.buttonArrowColor = @buttonArrowColor
|
||||||
|
ComboBox.buttonDisabledArrowColor = @buttonDisabledArrowColor
|
||||||
|
ComboBox.buttonHoverArrowColor = @buttonHoverArrowColor
|
||||||
|
ComboBox.buttonPressedArrowColor = @buttonPressedArrowColor
|
||||||
|
|
||||||
|
|
||||||
#---- Component ----
|
#---- Component ----
|
||||||
@@ -474,8 +478,8 @@ ScrollBar.hoverThumbWithTrack = false
|
|||||||
ScrollBar.pressedThumbWithTrack = false
|
ScrollBar.pressedThumbWithTrack = false
|
||||||
ScrollBar.showButtons = false
|
ScrollBar.showButtons = false
|
||||||
ScrollBar.squareButtons = false
|
ScrollBar.squareButtons = false
|
||||||
ScrollBar.buttonArrowColor = $ComboBox.buttonArrowColor
|
ScrollBar.buttonArrowColor = @buttonArrowColor
|
||||||
ScrollBar.buttonDisabledArrowColor = $ComboBox.buttonDisabledArrowColor
|
ScrollBar.buttonDisabledArrowColor = @buttonDisabledArrowColor
|
||||||
ScrollBar.allowsAbsolutePositioning = true
|
ScrollBar.allowsAbsolutePositioning = true
|
||||||
|
|
||||||
[mac]ScrollBar.minimumThumbSize = 18,18
|
[mac]ScrollBar.minimumThumbSize = 18,18
|
||||||
@@ -516,10 +520,10 @@ Slider.focusWidth = 4
|
|||||||
Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder
|
Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder
|
||||||
Spinner.background = @textComponentBackground
|
Spinner.background = @textComponentBackground
|
||||||
Spinner.buttonBackground = $ComboBox.buttonEditableBackground
|
Spinner.buttonBackground = $ComboBox.buttonEditableBackground
|
||||||
Spinner.buttonArrowColor = $ComboBox.buttonArrowColor
|
Spinner.buttonArrowColor = @buttonArrowColor
|
||||||
Spinner.buttonDisabledArrowColor = $ComboBox.buttonDisabledArrowColor
|
Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor
|
||||||
Spinner.buttonHoverArrowColor = $ComboBox.buttonHoverArrowColor
|
Spinner.buttonHoverArrowColor = @buttonHoverArrowColor
|
||||||
Spinner.buttonPressedArrowColor = $ComboBox.buttonPressedArrowColor
|
Spinner.buttonPressedArrowColor = @buttonPressedArrowColor
|
||||||
Spinner.padding = @textComponentMargin
|
Spinner.padding = @textComponentMargin
|
||||||
Spinner.editorBorderPainted = false
|
Spinner.editorBorderPainted = false
|
||||||
# allowed values: button or none
|
# allowed values: button or none
|
||||||
@@ -536,9 +540,9 @@ SplitPane.oneTouchButtonSize = {scaledInteger}6
|
|||||||
SplitPane.oneTouchButtonOffset = {scaledInteger}2
|
SplitPane.oneTouchButtonOffset = {scaledInteger}2
|
||||||
|
|
||||||
SplitPaneDivider.border = null
|
SplitPaneDivider.border = null
|
||||||
SplitPaneDivider.oneTouchArrowColor = $ComboBox.buttonArrowColor
|
SplitPaneDivider.oneTouchArrowColor = @buttonArrowColor
|
||||||
SplitPaneDivider.oneTouchHoverArrowColor = $ComboBox.buttonHoverArrowColor
|
SplitPaneDivider.oneTouchHoverArrowColor = @buttonHoverArrowColor
|
||||||
SplitPaneDivider.oneTouchPressedArrowColor = $ComboBox.buttonPressedArrowColor
|
SplitPaneDivider.oneTouchPressedArrowColor = @buttonPressedArrowColor
|
||||||
# allowed values: grip or plain
|
# allowed values: grip or plain
|
||||||
SplitPaneDivider.style = grip
|
SplitPaneDivider.style = grip
|
||||||
SplitPaneDivider.gripColor = @icon
|
SplitPaneDivider.gripColor = @icon
|
||||||
|
|||||||
@@ -36,6 +36,12 @@
|
|||||||
@cellFocusColor = #000
|
@cellFocusColor = #000
|
||||||
@icon = #afafaf
|
@icon = #afafaf
|
||||||
|
|
||||||
|
# for buttons within components (e.g. combobox or spinner)
|
||||||
|
@buttonArrowColor = #666
|
||||||
|
@buttonDisabledArrowColor = lighten(@buttonArrowColor,25%)
|
||||||
|
@buttonHoverArrowColor = lighten(@buttonArrowColor,20%,derived noAutoInverse)
|
||||||
|
@buttonPressedArrowColor = lighten(@buttonArrowColor,30%,derived noAutoInverse)
|
||||||
|
|
||||||
# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
|
# Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors)
|
||||||
@dropCellBackground = lighten(List.selectionBackground,10%,lazy)
|
@dropCellBackground = lighten(List.selectionBackground,10%,lazy)
|
||||||
@dropCellForeground = lazy(List.selectionForeground)
|
@dropCellForeground = lazy(List.selectionForeground)
|
||||||
@@ -47,8 +53,8 @@
|
|||||||
|
|
||||||
activeCaption = #99b4d1
|
activeCaption = #99b4d1
|
||||||
inactiveCaption = #bfcddb
|
inactiveCaption = #bfcddb
|
||||||
controlHighlight = #e3e3e3
|
controlHighlight = lighten($controlShadow,12%)
|
||||||
controlLtHighlight = #fff
|
controlLtHighlight = lighten($controlShadow,25%)
|
||||||
controlDkShadow = darken($controlShadow,15%)
|
controlDkShadow = darken($controlShadow,15%)
|
||||||
|
|
||||||
|
|
||||||
@@ -126,11 +132,7 @@ CheckBox.icon[filled].selectedPressedBackground = darken($CheckBox.icon[filled].
|
|||||||
|
|
||||||
#---- ComboBox ----
|
#---- ComboBox ----
|
||||||
|
|
||||||
ComboBox.buttonEditableBackground = #fafafa
|
ComboBox.buttonEditableBackground = darken($ComboBox.background,2%)
|
||||||
ComboBox.buttonArrowColor = #666
|
|
||||||
ComboBox.buttonDisabledArrowColor = lighten($ComboBox.buttonArrowColor,25%)
|
|
||||||
ComboBox.buttonHoverArrowColor = lighten($ComboBox.buttonArrowColor,20%,derived noAutoInverse)
|
|
||||||
ComboBox.buttonPressedArrowColor = lighten($ComboBox.buttonArrowColor,30%,derived noAutoInverse)
|
|
||||||
|
|
||||||
|
|
||||||
#---- Component ----
|
#---- Component ----
|
||||||
@@ -319,4 +321,4 @@ ToolTip.background = #fafafa
|
|||||||
|
|
||||||
#---- Tree ----
|
#---- Tree ----
|
||||||
|
|
||||||
Tree.hash = #E6E6E6
|
Tree.hash = darken($Tree.background,10%)
|
||||||
|
|||||||
@@ -1246,7 +1246,7 @@ Tree.editorBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F
|
|||||||
Tree.expandedIcon [lazy] 11,11 com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
|
Tree.expandedIcon [lazy] 11,11 com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI]
|
||||||
Tree.font [active] $defaultFont [UI]
|
Tree.font [active] $defaultFont [UI]
|
||||||
Tree.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
|
Tree.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
|
||||||
Tree.hash #505355 javax.swing.plaf.ColorUIResource [UI]
|
Tree.hash #515657 javax.swing.plaf.ColorUIResource [UI]
|
||||||
Tree.icon.closedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
Tree.icon.closedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
||||||
Tree.icon.collapsedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
Tree.icon.collapsedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
||||||
Tree.icon.expandedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
Tree.icon.expandedColor #adadad javax.swing.plaf.ColorUIResource [UI]
|
||||||
|
|||||||
@@ -32,6 +32,12 @@
|
|||||||
@cellFocusColor = #f00
|
@cellFocusColor = #f00
|
||||||
@icon = #afafaf
|
@icon = #afafaf
|
||||||
|
|
||||||
|
# for buttons within components (e.g. combobox or spinner)
|
||||||
|
@buttonArrowColor = #666
|
||||||
|
@buttonDisabledArrowColor = #ABABAB
|
||||||
|
@buttonHoverArrowColor = #f00
|
||||||
|
@buttonPressedArrowColor = #00f
|
||||||
|
|
||||||
@dropCellBackground = #f00
|
@dropCellBackground = #f00
|
||||||
@dropCellForeground = #0f0
|
@dropCellForeground = #0f0
|
||||||
@dropLineColor = #00f
|
@dropLineColor = #00f
|
||||||
@@ -118,10 +124,6 @@ CheckBox.icon.pressedBackground = #FFC800
|
|||||||
ComboBox.background = #fff
|
ComboBox.background = #fff
|
||||||
ComboBox.buttonBackground = #f0f0f0
|
ComboBox.buttonBackground = #f0f0f0
|
||||||
ComboBox.buttonEditableBackground = #ccc
|
ComboBox.buttonEditableBackground = #ccc
|
||||||
ComboBox.buttonArrowColor = #666
|
|
||||||
ComboBox.buttonDisabledArrowColor = #ABABAB
|
|
||||||
ComboBox.buttonHoverArrowColor = #f00
|
|
||||||
ComboBox.buttonPressedArrowColor = #00f
|
|
||||||
|
|
||||||
|
|
||||||
#---- Component ----
|
#---- Component ----
|
||||||
|
|||||||
Reference in New Issue
Block a user