diff --git a/flatlaf-testing/build.gradle.kts b/flatlaf-testing/build.gradle.kts index 0b10004a..6fd1b64f 100644 --- a/flatlaf-testing/build.gradle.kts +++ b/flatlaf-testing/build.gradle.kts @@ -41,6 +41,8 @@ dependencies { implementation( libs.jide.oss ) implementation( libs.glazedlists ) implementation( libs.netbeans.api.awt ) + + components.all() } applyLafs() @@ -58,3 +60,13 @@ fun applyLafs() { dependencies.implementation( parts[2] ) } } + +// rule that overrides 'org.gradle.jvm.version' with '8' +// (required for Radiance, which requires Java 9, but FlatLaf build uses Java 8) +abstract class TargetJvmVersion8Rule : ComponentMetadataRule { + override fun execute( context: ComponentMetadataContext ) { + context.details.allVariants { + attributes.attribute( TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 8 ) + } + } +} diff --git a/flatlaf-testing/lafs.properties b/flatlaf-testing/lafs.properties index 133a16e8..4e615fe2 100644 --- a/flatlaf-testing/lafs.properties +++ b/flatlaf-testing/lafs.properties @@ -1,5 +1,9 @@ -org.pushingpixels.substance.api.skin.SubstanceBusinessLookAndFeel = Substance Business;ctrl F5;org.pushing-pixels:radiance-substance:3.5.1 -org.pushingpixels.substance.api.skin.SubstanceGraphiteAquaLookAndFeel = Substance Graphite Aqua;ctrl F6 -com.alee.laf.WebLookAndFeel = WebLaf;ctrl F11;com.weblookandfeel:weblaf-ui:1.2.13 +org.pushingpixels.radiance.theming.api.skin.RadianceBusinessLookAndFeel = Radiance Business;ctrl F5;org.pushing-pixels:radiance-theming:7.0.1 +org.pushingpixels.radiance.theming.api.skin.RadianceGraphiteAquaLookAndFeel = Radiance Graphite Aqua;ctrl F6 +com.alee.laf.WebLookAndFeel = WebLaf;ctrl F11;com.weblookandfeel:weblaf-ui:1.2.14 com.jgoodies.looks.plastic.PlasticLookAndFeel = JGoodies Looks Plastic;ctrl F12;com.jgoodies:jgoodies-looks:2.7.0 com.jgoodies.looks.windows.WindowsLookAndFeel = JGoodies Looks Windows;ctrl F9 +mdlaf.MaterialLookAndFeel = Material-UI-Swing;shift F11;io.github.vincenzopalazzo:material-ui-swing:1.1.4 +com.github.weisj.darklaf.DarkLaf = DarkLaf;shift F12;com.github.weisj:darklaf-core:3.0.2 +com.github.weisj.darklaf.theme.laf.DarculaThemeDarklafLookAndFeel = DarkLaf Darcula;ctrl shift F12 +com.jtattoo.plaf.smart.SmartLookAndFeel = JTattoo;ctrl shift F11;com.jtattoo:JTattoo:1.6.13 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 6571bf45..fd30dffd 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 @@ -119,10 +119,9 @@ public class UIDefaultsDump // // dump( "com.jgoodies.looks.plastic.PlasticLookAndFeel", dir, false ); // dump( "com.jgoodies.looks.windows.WindowsLookAndFeel", dir, false ); -// dump( "com.alee.laf.WebLookAndFeel", dir, false ); // try { -// EventQueue.invokeAndWait( () -> { -// dump( "org.pushingpixels.substance.api.skin.SubstanceGraphiteAquaLookAndFeel", dir, false ); +// SwingUtilities.invokeAndWait( () -> { +// dump( "org.pushingpixels.radiance.theming.api.skin.RadianceGraphiteAquaLookAndFeel", dir, false ); // } ); // } catch( Exception ex ) { // // TODO Auto-generated catch block @@ -673,7 +672,7 @@ public class UIDefaultsDump switch( borderClassName ) { case "com.apple.laf.AquaToolBarUI$ToolBarBorder": - case "org.pushingpixels.substance.internal.utils.border.SubstanceToolBarBorder": + case "org.pushingpixels.radiance.theming.internal.utils.border.RadianceToolBarBorder": c = new JToolBar(); break;