diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf53180..ad19ce2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ FlatLaf Change Log - Extras: Added missing export of package `com.formdev.flatlaf.extras.components` to Java 9 module descriptor. +- JIDE Common Layer: Invoke `LookAndFeelFactory.installJideExtension()` when + using FlatLaf UI delegates. (issue #230) ## 0.46 diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java index 86494336..8ae713eb 100644 --- a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java +++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatJideTabbedPaneUI.java @@ -39,6 +39,7 @@ import javax.swing.UIManager; import javax.swing.plaf.ComponentUI; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.ui.FlatUIUtils; +import com.jidesoft.plaf.LookAndFeelFactory; import com.jidesoft.plaf.UIDefaultsLookup; import com.jidesoft.plaf.basic.BasicJideTabbedPaneUI; import com.jidesoft.swing.JideTabbedPane; @@ -66,6 +67,7 @@ public class FlatJideTabbedPaneUI private Object[] oldRenderingHints; public static ComponentUI createUI( JComponent c ) { + LookAndFeelFactory.installJideExtension(); return new FlatJideTabbedPaneUI(); } diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java index a8793da6..e92cb859 100644 --- a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java +++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java @@ -36,6 +36,7 @@ import javax.swing.plaf.ComponentUI; import com.formdev.flatlaf.ui.FlatSliderUI; import com.formdev.flatlaf.ui.FlatUIUtils; import com.formdev.flatlaf.util.UIScale; +import com.jidesoft.plaf.LookAndFeelFactory; import com.jidesoft.plaf.basic.BasicRangeSliderUI; /** @@ -65,6 +66,7 @@ public class FlatRangeSliderUI private Object[] oldRenderingHints; public static ComponentUI createUI( JComponent c ) { + LookAndFeelFactory.installJideExtension(); return new FlatRangeSliderUI(); } diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java index 936fa1a2..b9c8e66b 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatJideOssTest.java @@ -24,7 +24,6 @@ import javax.swing.border.*; import com.formdev.flatlaf.testing.*; import com.formdev.flatlaf.testing.FlatTestFrame; import com.jgoodies.forms.layout.*; -import com.jidesoft.plaf.LookAndFeelFactory; import com.jidesoft.popup.JidePopup; import com.jidesoft.swing.*; import net.miginfocom.swing.*; @@ -38,14 +37,7 @@ public class FlatJideOssTest public static void main( String[] args ) { SwingUtilities.invokeLater( () -> { FlatTestFrame frame = FlatTestFrame.create( args, "FlatJideOssTest" ); - LookAndFeelFactory.installJideExtension(); frame.showFrame( FlatJideOssTest::new ); - - UIManager.addPropertyChangeListener( e -> { - if( "lookAndFeel".equals( e.getPropertyName() ) ) { - LookAndFeelFactory.installJideExtension(); - } - } ); } ); } diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatRangeSliderTest.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatRangeSliderTest.java index a84c6c88..e2daf1d6 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatRangeSliderTest.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/jideoss/FlatRangeSliderTest.java @@ -22,11 +22,9 @@ import javax.swing.JLabel; import javax.swing.JSlider; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import javax.swing.UIManager; import javax.swing.event.ChangeListener; import com.formdev.flatlaf.testing.FlatTestFrame; import com.formdev.flatlaf.testing.FlatTestPanel; -import com.jidesoft.plaf.LookAndFeelFactory; import com.jidesoft.swing.RangeSlider; import net.miginfocom.swing.MigLayout; @@ -37,14 +35,7 @@ public class FlatRangeSliderTest public static void main( String[] args ) { SwingUtilities.invokeLater( () -> { FlatTestFrame frame = FlatTestFrame.create( args, "FlatRangeSliderTest" ); - LookAndFeelFactory.installJideExtension(); frame.showFrame( FlatRangeSliderTest::new ); - - UIManager.addPropertyChangeListener( e -> { - if( "lookAndFeel".equals( e.getPropertyName() ) ) { - LookAndFeelFactory.installJideExtension(); - } - } ); } ); }