From 92258f3ba3903f7eab4c5f85bf93176c9f5dbcec Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 27 Feb 2020 12:49:43 +0100 Subject: [PATCH] ScrollBar: improved colors Table: use color functions --- CHANGELOG.md | 1 + .../com/formdev/flatlaf/FlatDarkLaf.properties | 14 +++++++------- .../com/formdev/flatlaf/FlatLightLaf.properties | 14 +++++++------- .../uidefaults/FlatDarkLaf_1.8.0_202-mac.txt | 12 ++++++------ .../testing/uidefaults/FlatDarkLaf_1.8.0_202.txt | 12 ++++++------ .../uidefaults/FlatLightLaf_1.8.0_202-mac.txt | 10 +++++----- .../testing/uidefaults/FlatLightLaf_1.8.0_202.txt | 10 +++++----- 7 files changed, 37 insertions(+), 36 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cbef6961..deb99d01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ FlatLaf Change Log default value `TextComponent.arc`). (issue #65) - IntelliJ Themes: Added Gradianto themes to demo. - Button, CheckBox and RadioButton: Fixed NPE when button has children. (PR #68) +- ScrollBar: Improved colors. ## 0.27 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 95847685..014cf7a4 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -203,9 +203,9 @@ ProgressBar.selectionBackground=@foreground #---- ScrollBar ---- ScrollBar.track=#3F4244 -ScrollBar.thumb=#5B5E5F -ScrollBar.hoverTrackColor=#434647 -ScrollBar.hoverThumbColor=#666868 +ScrollBar.thumb=lighten($ScrollBar.track,10%) +ScrollBar.hoverTrackColor=lighten($ScrollBar.track,4%) +ScrollBar.hoverThumbColor=lighten($ScrollBar.thumb,10%) #---- Separator ---- @@ -241,14 +241,14 @@ TabbedPane.contentAreaColor=#323232 #---- Table ---- Table.background=@textComponentBackground -Table.gridColor=#4F5152 +Table.gridColor=lighten($Table.background,3%) #---- TableHeader ---- -TableHeader.background=#45494A -TableHeader.separatorColor=#585858 -TableHeader.bottomSeparatorColor=#585858 +TableHeader.background=@textComponentBackground +TableHeader.separatorColor=lighten($TableHeader.background,10%) +TableHeader.bottomSeparatorColor=$TableHeader.separatorColor #---- ToggleButton ---- 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 472f7b74..c643863f 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -210,9 +210,9 @@ ProgressBar.selectionBackground=@foreground #---- ScrollBar ---- ScrollBar.track=#F5F5F5 -ScrollBar.thumb=#DBDBDB -ScrollBar.hoverTrackColor=#e6e6e6 -ScrollBar.hoverThumbColor=#c6c6c6 +ScrollBar.thumb=darken($ScrollBar.track,10%) +ScrollBar.hoverTrackColor=darken($ScrollBar.track,3%) +ScrollBar.hoverThumbColor=darken($ScrollBar.thumb,10%) #---- Separator ---- @@ -248,14 +248,14 @@ TabbedPane.contentAreaColor=#bfbfbf #---- Table ---- Table.background=@textComponentBackground -Table.gridColor=#F7F7F7 +Table.gridColor=darken($Table.background,3%) #---- TableHeader ---- -TableHeader.background=#ffffff -TableHeader.separatorColor=#e5e5e5 -TableHeader.bottomSeparatorColor=#e5e5e5 +TableHeader.background=@textComponentBackground +TableHeader.separatorColor=darken($TableHeader.background,10%) +TableHeader.bottomSeparatorColor=$TableHeader.separatorColor #---- ToggleButton ---- diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 7f036871..069e8b8e 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -729,13 +729,13 @@ ScrollBar.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonArrowColor #9a9da1 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonDisabledArrowColor #585858 javax.swing.plaf.ColorUIResource [UI] ScrollBar.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverThumbColor #666868 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverTrackColor #434647 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverThumbColor #717678 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverTrackColor #494c4f javax.swing.plaf.ColorUIResource [UI] ScrollBar.maximumThumbSize 4096,4096 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumThumbSize 8,8 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.showButtons false ScrollBar.squareButtons false -ScrollBar.thumb #5b5e5f javax.swing.plaf.ColorUIResource [UI] +ScrollBar.thumb #585c5e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbDarkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #242424 javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbShadow #646464 javax.swing.plaf.ColorUIResource [UI] @@ -888,7 +888,7 @@ Table.focusCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.F Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI] Table.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] Table.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Table.gridColor #4f5152 javax.swing.plaf.ColorUIResource [UI] +Table.gridColor #4c5152 javax.swing.plaf.ColorUIResource [UI] Table.intercellSpacing 0,0 javax.swing.plaf.DimensionUIResource [UI] Table.rowHeight 20 Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] @@ -904,13 +904,13 @@ Table.sortIconColor #adadad javax.swing.plaf.ColorUIResource [UI] #---- TableHeader ---- TableHeader.background #45494a javax.swing.plaf.ColorUIResource [UI] -TableHeader.bottomSeparatorColor #585858 javax.swing.plaf.ColorUIResource [UI] +TableHeader.bottomSeparatorColor #5e6364 javax.swing.plaf.ColorUIResource [UI] TableHeader.cellBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] TableHeader.focusCellBackground #45494a javax.swing.plaf.ColorUIResource [UI] TableHeader.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TableHeader.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] TableHeader.height 25 -TableHeader.separatorColor #585858 javax.swing.plaf.ColorUIResource [UI] +TableHeader.separatorColor #5e6364 javax.swing.plaf.ColorUIResource [UI] TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index ff8ae874..a9006f26 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -728,13 +728,13 @@ ScrollBar.background #3c3f41 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonArrowColor #9a9da1 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonDisabledArrowColor #585858 javax.swing.plaf.ColorUIResource [UI] ScrollBar.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverThumbColor #666868 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverTrackColor #434647 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverThumbColor #717678 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverTrackColor #494c4f javax.swing.plaf.ColorUIResource [UI] ScrollBar.maximumThumbSize 4096,4096 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumThumbSize 8,8 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.showButtons false ScrollBar.squareButtons false -ScrollBar.thumb #5b5e5f javax.swing.plaf.ColorUIResource [UI] +ScrollBar.thumb #585c5e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbDarkShadow #7e7e7e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #242424 javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbShadow #646464 javax.swing.plaf.ColorUIResource [UI] @@ -887,7 +887,7 @@ Table.focusCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.F Table.focusSelectedCellHighlightBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatTableCellBorder$Selected [UI] Table.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] Table.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Table.gridColor #4f5152 javax.swing.plaf.ColorUIResource [UI] +Table.gridColor #4c5152 javax.swing.plaf.ColorUIResource [UI] Table.intercellSpacing 0,0 javax.swing.plaf.DimensionUIResource [UI] Table.rowHeight 20 Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] @@ -903,13 +903,13 @@ Table.sortIconColor #adadad javax.swing.plaf.ColorUIResource [UI] #---- TableHeader ---- TableHeader.background #45494a javax.swing.plaf.ColorUIResource [UI] -TableHeader.bottomSeparatorColor #585858 javax.swing.plaf.ColorUIResource [UI] +TableHeader.bottomSeparatorColor #5e6364 javax.swing.plaf.ColorUIResource [UI] TableHeader.cellBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] TableHeader.focusCellBackground #45494a javax.swing.plaf.ColorUIResource [UI] TableHeader.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] TableHeader.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] TableHeader.height 25 -TableHeader.separatorColor #585858 javax.swing.plaf.ColorUIResource [UI] +TableHeader.separatorColor #5e6364 javax.swing.plaf.ColorUIResource [UI] TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index 57e2207e..15d57e48 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -731,13 +731,13 @@ ScrollBar.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonArrowColor #666666 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonDisabledArrowColor #ababab javax.swing.plaf.ColorUIResource [UI] ScrollBar.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverThumbColor #c6c6c6 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverTrackColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverThumbColor #c3c3c3 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverTrackColor #ededed javax.swing.plaf.ColorUIResource [UI] ScrollBar.maximumThumbSize 4096,4096 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumThumbSize 8,8 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.showButtons false ScrollBar.squareButtons false -ScrollBar.thumb #dbdbdb javax.swing.plaf.ColorUIResource [UI] +ScrollBar.thumb #dcdcdc javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbDarkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #ffffff javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] @@ -906,13 +906,13 @@ Table.sortIconColor #afafaf javax.swing.plaf.ColorUIResource [UI] #---- TableHeader ---- TableHeader.background #ffffff javax.swing.plaf.ColorUIResource [UI] -TableHeader.bottomSeparatorColor #e5e5e5 javax.swing.plaf.ColorUIResource [UI] +TableHeader.bottomSeparatorColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] TableHeader.cellBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] TableHeader.focusCellBackground #ffffff javax.swing.plaf.ColorUIResource [UI] TableHeader.font .SF NS Text plain 13 javax.swing.plaf.FontUIResource [UI] TableHeader.foreground #000000 javax.swing.plaf.ColorUIResource [UI] TableHeader.height 25 -TableHeader.separatorColor #e5e5e5 javax.swing.plaf.ColorUIResource [UI] +TableHeader.separatorColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 3175e23f..0ddf06d9 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -730,13 +730,13 @@ ScrollBar.background #f2f2f2 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonArrowColor #666666 javax.swing.plaf.ColorUIResource [UI] ScrollBar.buttonDisabledArrowColor #ababab javax.swing.plaf.ColorUIResource [UI] ScrollBar.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverThumbColor #c6c6c6 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.hoverTrackColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverThumbColor #c3c3c3 javax.swing.plaf.ColorUIResource [UI] +ScrollBar.hoverTrackColor #ededed javax.swing.plaf.ColorUIResource [UI] ScrollBar.maximumThumbSize 4096,4096 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumThumbSize 8,8 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.showButtons false ScrollBar.squareButtons false -ScrollBar.thumb #dbdbdb javax.swing.plaf.ColorUIResource [UI] +ScrollBar.thumb #dcdcdc javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbDarkShadow #9e9e9e javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #ffffff javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] @@ -905,13 +905,13 @@ Table.sortIconColor #afafaf javax.swing.plaf.ColorUIResource [UI] #---- TableHeader ---- TableHeader.background #ffffff javax.swing.plaf.ColorUIResource [UI] -TableHeader.bottomSeparatorColor #e5e5e5 javax.swing.plaf.ColorUIResource [UI] +TableHeader.bottomSeparatorColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] TableHeader.cellBorder [lazy] 2,3,2,3 false com.formdev.flatlaf.ui.FlatEmptyBorder [UI] TableHeader.focusCellBackground #ffffff javax.swing.plaf.ColorUIResource [UI] TableHeader.font Segoe UI plain 12 javax.swing.plaf.FontUIResource [UI] TableHeader.foreground #000000 javax.swing.plaf.ColorUIResource [UI] TableHeader.height 25 -TableHeader.separatorColor #e5e5e5 javax.swing.plaf.ColorUIResource [UI] +TableHeader.separatorColor #e6e6e6 javax.swing.plaf.ColorUIResource [UI] TableHeaderUI com.formdev.flatlaf.ui.FlatTableHeaderUI