From 6568cee2e89301fd6ca34d6a07ea6220c28195c3 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 18 Jun 2020 20:29:40 +0200 Subject: [PATCH] UIDefaultsDump: dump IntelliJ and Darcula themes (as differences to Light/dark themes; Windows only) --- .../testing/uidefaults/UIDefaultsDump.java | 22 ++-- .../uidefaults/FlatDarculaLaf_1.8.0_202.txt | 63 +++++++++++ .../uidefaults/FlatIntelliJLaf_1.8.0_202.txt | 100 ++++++++++++++++++ 3 files changed, 178 insertions(+), 7 deletions(-) create mode 100644 flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarculaLaf_1.8.0_202.txt create mode 100644 flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatIntelliJLaf_1.8.0_202.txt diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java index c44ff61a..8effa9ca 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/uidefaults/UIDefaultsDump.java @@ -89,9 +89,11 @@ public class UIDefaultsDump dump( FlatLightLaf.class.getName(), dir ); dump( FlatDarkLaf.class.getName(), dir ); -// dump( FlatIntelliJLaf.class.getName(), dir ); -// dump( FlatDarculaLaf.class.getName(), dir ); -// + if( SystemInfo.IS_WINDOWS ) { + dump( FlatIntelliJLaf.class.getName(), dir ); + dump( FlatDarculaLaf.class.getName(), dir ); + } + // dump( MyBasicLookAndFeel.class.getName(), dir ); // dump( MetalLookAndFeel.class.getName(), dir ); // dump( NimbusLookAndFeel.class.getName(), dir ); @@ -170,14 +172,20 @@ public class UIDefaultsDump : ((SystemInfo.IS_LINUX && lookAndFeel instanceof FlatLaf) ? "-linux" : ""); + String javaVersion = System.getProperty( "java.version" ); File file = new File( dir, name + nameSuffix + "_" - + System.getProperty( "java.version" ) + osSuffix + ".txt" ); + + javaVersion + osSuffix + ".txt" ); // build differences String content; - if( !osSuffix.isEmpty() && nameSuffix.isEmpty() ) { - File origFile = new File( dir, name + nameSuffix + "_" - + System.getProperty( "java.version" ) + ".txt" ); + File origFile = null; + if( !osSuffix.isEmpty() && nameSuffix.isEmpty() ) + origFile = new File( dir, name + nameSuffix + "_" + javaVersion + ".txt" ); + else if( lookAndFeel instanceof FlatIntelliJLaf && SystemInfo.IS_WINDOWS ) + origFile = new File( dir, "FlatLightLaf_" + javaVersion + ".txt" ); + else if( lookAndFeel instanceof FlatDarculaLaf && SystemInfo.IS_WINDOWS ) + origFile = new File( dir, "FlatDarkLaf_" + javaVersion + ".txt" ); + if( origFile != null ) { try { Map defaults1 = parse( new FileReader( origFile ) ); Map defaults2 = parse( new StringReader( stringWriter.toString() ) ); diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarculaLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarculaLaf_1.8.0_202.txt new file mode 100644 index 00000000..d4e91e74 --- /dev/null +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarculaLaf_1.8.0_202.txt @@ -0,0 +1,63 @@ +- Class com.formdev.flatlaf.FlatDarkLaf ++ Class com.formdev.flatlaf.FlatDarculaLaf + +- ID FlatLaf - FlatLaf Dark ++ ID FlatLaf - FlatLaf Darcula + +- Name FlatLaf Dark ++ Name FlatLaf Darcula + +- Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] ++ Button.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] + +- ComboBox.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] ++ ComboBox.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] + +- Component.arrowType chevron ++ Component.arrowType triangle + +- Component.focusWidth 0 ++ Component.focusWidth 2 + +- Component.innerFocusWidth 0.5 ++ Component.innerFocusWidth 0 + +- Component.innerOutlineWidth 1.0 ++ Component.innerOutlineWidth 0 + +- FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ FormattedTextField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] ++ HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] + +- JXDatePicker.border [lazy] 1,1,1,1 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI] ++ JXDatePicker.border [lazy] 3,3,3,3 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI] + +- PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ PasswordField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- ProgressBar.foreground #4a88c7 javax.swing.plaf.ColorUIResource [UI] ++ ProgressBar.foreground #a0a0a0 javax.swing.plaf.ColorUIResource [UI] + +- ProgressBar.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] ++ ProgressBar.selectionForeground #3c3f41 javax.swing.plaf.ColorUIResource [UI] + +- RadioButton.icon.centerDiameter 8 ++ RadioButton.icon.centerDiameter 5 + +- ScrollPane.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] ++ ScrollPane.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatBorder [UI] + +- Spinner.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] ++ Spinner.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] + +- Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] ++ Table.scrollPaneBorder [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatBorder [UI] + +- TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ TextField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] ++ ToggleButton.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] + diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatIntelliJLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatIntelliJLaf_1.8.0_202.txt new file mode 100644 index 00000000..2b3772a2 --- /dev/null +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatIntelliJLaf_1.8.0_202.txt @@ -0,0 +1,100 @@ +- Class com.formdev.flatlaf.FlatLightLaf ++ Class com.formdev.flatlaf.FlatIntelliJLaf + +- ID FlatLaf - FlatLaf Light ++ ID FlatLaf - FlatLaf IntelliJ + +- Name FlatLaf Light ++ Name FlatLaf IntelliJ + +- Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] ++ Button.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] + +- Button.default.background #ffffff javax.swing.plaf.ColorUIResource [UI] ++ Button.default.background #4d8ac9 javax.swing.plaf.ColorUIResource [UI] + ++ Button.default.boldText true + +- Button.default.borderColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI] ++ Button.default.borderColor #3d75b2 javax.swing.plaf.ColorUIResource [UI] + +- Button.default.borderWidth 2 ++ Button.default.borderWidth 1 + +- Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] ++ Button.default.focusedBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI] + +- Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI] ++ Button.default.foreground #ffffff javax.swing.plaf.ColorUIResource [UI] + +- Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] ++ Button.default.hoverBorderColor #a9c9f5 javax.swing.plaf.ColorUIResource [UI] + +- CheckBox.icon.checkmarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI] ++ CheckBox.icon.checkmarkColor #ffffff javax.swing.plaf.ColorUIResource [UI] + +- CheckBox.icon.selectedBackground #ffffff javax.swing.plaf.ColorUIResource [UI] ++ CheckBox.icon.selectedBackground #4f9ee3 javax.swing.plaf.ColorUIResource [UI] + +- CheckBox.icon.selectedBorderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI] ++ CheckBox.icon.selectedBorderColor #4b97d9 javax.swing.plaf.ColorUIResource [UI] + ++ CheckBox.icon.selectedFocusedBorderColor #accff7 javax.swing.plaf.ColorUIResource [UI] + ++ CheckBox.icon.selectedHoverBackground #5e94ce javax.swing.plaf.ColorUIResource [UI] + ++ CheckBox.icon.selectedPressedBackground #72a1d4 javax.swing.plaf.ColorUIResource [UI] + +- ComboBox.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] ++ ComboBox.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] + +- Component.arrowType chevron ++ Component.arrowType triangle + +- Component.focusWidth 0 ++ Component.focusWidth 2 + +- Component.innerFocusWidth 0.5 ++ Component.innerFocusWidth 0 + +- Component.innerOutlineWidth 1.0 ++ Component.innerOutlineWidth 0 + +- FormattedTextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ FormattedTextField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] ++ HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] + +- JXDatePicker.border [lazy] 1,1,1,1 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI] ++ JXDatePicker.border [lazy] 3,3,3,3 false com.formdev.flatlaf.swingx.ui.FlatDatePickerBorder [UI] + +- PasswordField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ PasswordField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- RadioButton.icon.centerDiameter 8 ++ RadioButton.icon.centerDiameter 5 + +- ScrollPane.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] ++ ScrollPane.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatBorder [UI] + +- Spinner.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] ++ Spinner.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatRoundBorder [UI] + +- Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] ++ Table.scrollPaneBorder [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatBorder [UI] + +- TextField.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatTextBorder [UI] ++ TextField.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatTextBorder [UI] + +- ToggleButton.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] ++ ToggleButton.border [lazy] 3,3,3,3 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] + +- Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] + +- Button.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] + +- CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] + +- HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] +