Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

IntelliJ Themes: fixed background colors of DesktopPane and DesktopIcon in all themes

Browse Source
This commit is contained in:
Karl Tauber
2021-04-11 19:39:47 +02:00
parent 0d86d39217
commit 46ac7a9dc7
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -26,6 +26,8 @@ FlatLaf Change Log
internal frames in dock. internal frames in dock.
- PopupFactory: Fixed occasional `NullPointerException` in - PopupFactory: Fixed occasional `NullPointerException` in
`FlatPopupFactory.fixToolTipLocation()`. (issue #305) `FlatPopupFactory.fixToolTipLocation()`. (issue #305)
- IntelliJ Themes: Fixed background colors of DesktopPane and DesktopIcon in all
themes.
## 1.1.2 ## 1.1.2

11
flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java
View File

@@ -34,6 +34,7 @@ import javax.swing.UIDefaults;
import javax.swing.plaf.ColorUIResource; import javax.swing.plaf.ColorUIResource;
import com.formdev.flatlaf.json.Json; import com.formdev.flatlaf.json.Json;
import com.formdev.flatlaf.json.ParseException; import com.formdev.flatlaf.json.ParseException;
import com.formdev.flatlaf.util.ColorFunctions;
import com.formdev.flatlaf.util.LoggingFacade; import com.formdev.flatlaf.util.LoggingFacade;
import com.formdev.flatlaf.util.StringUtils; import com.formdev.flatlaf.util.StringUtils;
@@ -215,6 +216,12 @@ public class IntelliJTheme
if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) ) if( !uiKeys.contains( "ToggleButton.foreground" ) && uiKeys.contains( "Button.foreground" ) )
defaults.put( "ToggleButton.foreground", defaults.get( "Button.foreground" ) ); defaults.put( "ToggleButton.foreground", defaults.get( "Button.foreground" ) );
// fix DesktopPane background (use Panel.background and make it 5% darker/lighter)
Color desktopBackgroundBase = defaults.getColor( "Panel.background" );
Color desktopBackground = ColorFunctions.applyFunctions( desktopBackgroundBase,
new ColorFunctions.HSLIncreaseDecrease( 2, dark, 5, false, true ) );
defaults.put( "Desktop.background", new ColorUIResource( desktopBackground ) );
// fix List and Table background colors in Material UI Lite themes // fix List and Table background colors in Material UI Lite themes
if( isMaterialUILite ) { if( isMaterialUILite ) {
defaults.put( "List.background", defaults.get( "Tree.background" ) ); defaults.put( "List.background", defaults.get( "Tree.background" ) );
@@ -345,6 +352,10 @@ public class IntelliJTheme
// replace all values in UI defaults that match the wildcard key // replace all values in UI defaults that match the wildcard key
for( Object k : defaultsKeysCache ) { for( Object k : defaultsKeysCache ) {
if( k.equals( "Desktop.background" ) ||
k.equals( "DesktopIcon.background" ) )
continue;
if( k instanceof String ) { if( k instanceof String ) {
// support replacing of mapped keys // support replacing of mapped keys
// (e.g. set ComboBox.buttonEditableBackground to *.background // (e.g. set ComboBox.buttonEditableBackground to *.background