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

ToggleButton: compute selected background color based on current component background (issue #32)

Browse Source
This commit is contained in:
Karl Tauber
2020-04-22 09:48:58 +02:00
parent 23f0504b30
commit dd06b554da
9 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,9 +94,9 @@ Button.rollover true
Button.shadow #646464 javax.swing.plaf.ColorUIResource [UI]
Button.textIconGap 4
Button.textShiftOffset 0
Button.toolbar.hoverBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.hoverBackground #4e5355 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI]
Button.toolbar.pressedBackground #555a5d javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.pressedBackground #565a5d com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI]
ButtonUI com.formdev.flatlaf.ui.FlatButtonUI
@@ -1018,7 +1018,7 @@ TitledPanelUI com.formdev.flatlaf.swingx.ui.FlatTitledPanelUI
ToggleButton.background #4c5052 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
ToggleButton.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #525658 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.font [active] $defaultFont [UI]
ToggleButton.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -1028,7 +1028,7 @@ ToggleButton.light #313131 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.rollover true
ToggleButton.selectedBackground #64696c javax.swing.plaf.ColorUIResource [UI]
ToggleButton.selectedBackground #656a6c com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.selectedForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ToggleButton.shadow #646464 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.disabledUnderlineColor #7a7a7a javax.swing.plaf.ColorUIResource [UI]
@@ -1038,9 +1038,9 @@ ToggleButton.tab.underlineColor #4a88c7 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.underlineHeight 2
ToggleButton.textIconGap 4
ToggleButton.textShiftOffset 0
ToggleButton.toolbar.hoverBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.pressedBackground #555a5d javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.selectedBackground #5c6164 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.hoverBackground #4e5355 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.pressedBackground #565a5d com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.selectedBackground #5d6265 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI

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

@@ -94,9 +94,9 @@ Button.rollover true
Button.shadow #646464 javax.swing.plaf.ColorUIResource [UI]
Button.textIconGap 4
Button.textShiftOffset 0
Button.toolbar.hoverBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.hoverBackground #4e5355 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI]
Button.toolbar.pressedBackground #555a5d javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.pressedBackground #565a5d com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI]
ButtonUI com.formdev.flatlaf.ui.FlatButtonUI
@@ -1016,7 +1016,7 @@ TitledPanelUI com.formdev.flatlaf.swingx.ui.FlatTitledPanelUI
ToggleButton.background #4c5052 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
ToggleButton.darkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #525658 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.disabledText #777777 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.font [active] $defaultFont [UI]
ToggleButton.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
@@ -1026,7 +1026,7 @@ ToggleButton.light #313131 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.rollover true
ToggleButton.selectedBackground #64696c javax.swing.plaf.ColorUIResource [UI]
ToggleButton.selectedBackground #656a6c com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.selectedForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI]
ToggleButton.shadow #646464 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.disabledUnderlineColor #7a7a7a javax.swing.plaf.ColorUIResource [UI]
@@ -1036,9 +1036,9 @@ ToggleButton.tab.underlineColor #4a88c7 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.underlineHeight 2
ToggleButton.textIconGap 4
ToggleButton.textShiftOffset 0
ToggleButton.toolbar.hoverBackground #4c5052 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.pressedBackground #555a5d javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.selectedBackground #5c6164 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.hoverBackground #4e5355 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.pressedBackground #565a5d com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.selectedBackground #5d6265 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI

14
flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt
View File

@@ -95,9 +95,9 @@ Button.rollover true
Button.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI]
Button.textIconGap 4
Button.textShiftOffset 0
Button.toolbar.hoverBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.hoverBackground #e0e0e0 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI]
Button.toolbar.pressedBackground #d8d8d8 javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.pressedBackground #d9d9d9 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI]
ButtonUI com.formdev.flatlaf.ui.FlatButtonUI
@@ -1020,7 +1020,7 @@ TitledPanelUI com.formdev.flatlaf.swingx.ui.FlatTitledPanelUI
ToggleButton.background #ffffff javax.swing.plaf.ColorUIResource [UI]
ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
ToggleButton.darkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #dedede com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.disabledText #8c8c8c javax.swing.plaf.ColorUIResource [UI]
ToggleButton.font [active] $defaultFont [UI]
ToggleButton.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
@@ -1030,7 +1030,7 @@ ToggleButton.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.rollover true
ToggleButton.selectedBackground #cfcfcf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.selectedForeground #000000 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.disabledUnderlineColor #ababab javax.swing.plaf.ColorUIResource [UI]
@@ -1040,9 +1040,9 @@ ToggleButton.tab.underlineColor #4083c9 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.underlineHeight 2
ToggleButton.textIconGap 4
ToggleButton.textShiftOffset 0
ToggleButton.toolbar.hoverBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.pressedBackground #d8d8d8 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.selectedBackground #cfcfcf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.hoverBackground #e0e0e0 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.pressedBackground #d9d9d9 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI

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

@@ -95,9 +95,9 @@ Button.rollover true
Button.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI]
Button.textIconGap 4
Button.textShiftOffset 0
Button.toolbar.hoverBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.hoverBackground #e0e0e0 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI]
Button.toolbar.pressedBackground #d8d8d8 javax.swing.plaf.ColorUIResource [UI]
Button.toolbar.pressedBackground #d9d9d9 com.formdev.flatlaf.util.DerivedColor [UI]
Button.toolbar.spacingInsets 1,2,1,2 javax.swing.plaf.InsetsUIResource [UI]
ButtonUI com.formdev.flatlaf.ui.FlatButtonUI
@@ -1018,7 +1018,7 @@ TitledPanelUI com.formdev.flatlaf.swingx.ui.FlatTitledPanelUI
ToggleButton.background #ffffff javax.swing.plaf.ColorUIResource [UI]
ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI]
ToggleButton.darkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.disabledSelectedBackground #dedede com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.disabledText #8c8c8c javax.swing.plaf.ColorUIResource [UI]
ToggleButton.font [active] $defaultFont [UI]
ToggleButton.foreground #000000 javax.swing.plaf.ColorUIResource [UI]
@@ -1028,7 +1028,7 @@ ToggleButton.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI]
ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.rollover true
ToggleButton.selectedBackground #cfcfcf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.selectedForeground #000000 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.disabledUnderlineColor #ababab javax.swing.plaf.ColorUIResource [UI]
@@ -1038,9 +1038,9 @@ ToggleButton.tab.underlineColor #4083c9 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.tab.underlineHeight 2
ToggleButton.textIconGap 4
ToggleButton.textShiftOffset 0
ToggleButton.toolbar.hoverBackground #dfdfdf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.pressedBackground #d8d8d8 javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.selectedBackground #cfcfcf javax.swing.plaf.ColorUIResource [UI]
ToggleButton.toolbar.hoverBackground #e0e0e0 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.pressedBackground #d9d9d9 com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButton.toolbar.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI]
ToggleButtonUI com.formdev.flatlaf.ui.FlatToggleButtonUI