From c8db01c9586a1d94570c0e3650f8bba91a3f098b Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 5 Apr 2021 14:24:49 +0200 Subject: [PATCH] SplitPane: fixed `JSplitPane.setContinuousLayout(false)` (issue #301) --- CHANGELOG.md | 1 + .../com/formdev/flatlaf/ui/FlatSplitPaneUI.java | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d222ca45..e18959c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ FlatLaf Change Log `TitlePane.unifiedBackground` is `true`. - Button and ToggleButton: Do not paint background of disabled (and unselected) toolBar buttons. (issue #292; regression since fixing #112) +- SplitPane: `JSplitPane.setContinuousLayout(false)` did not work. (issue #301) - TabbedPane: Fixed NPE when creating/modifying in another thread. (issue #299) - Fixed crash when running in Webswing. (issue #290) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java index 1bc4a5a5..16ec4eba 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSplitPaneUI.java @@ -46,10 +46,13 @@ import com.formdev.flatlaf.util.UIScale; * @uiDefault SplitPaneDivider.border Border * @uiDefault SplitPaneDivider.draggingColor Color only used if continuousLayout is false * + * + * + * @uiDefault SplitPane.continuousLayout boolean + * * * * @uiDefault Component.arrowType String chevron (default) or triangle - * @uiDefault SplitPane.continuousLayout boolean * @uiDefault SplitPaneDivider.oneTouchArrowColor Color * @uiDefault SplitPaneDivider.oneTouchHoverArrowColor Color * @uiDefault SplitPaneDivider.oneTouchPressedArrowColor Color @@ -65,7 +68,6 @@ public class FlatSplitPaneUI extends BasicSplitPaneUI { protected String arrowType; - private Boolean continuousLayout; protected Color oneTouchArrowColor; protected Color oneTouchHoverArrowColor; protected Color oneTouchPressedArrowColor; @@ -85,8 +87,6 @@ public class FlatSplitPaneUI oneTouchPressedArrowColor = UIManager.getColor( "SplitPaneDivider.oneTouchPressedArrowColor" ); super.installDefaults(); - - continuousLayout = (Boolean) UIManager.get( "SplitPane.continuousLayout" ); } @Override @@ -98,11 +98,6 @@ public class FlatSplitPaneUI oneTouchPressedArrowColor = null; } - @Override - public boolean isContinuousLayout() { - return super.isContinuousLayout() || (continuousLayout != null && Boolean.TRUE.equals( continuousLayout )); - } - @Override public BasicSplitPaneDivider createDefaultDivider() { return new FlatSplitPaneDivider( this );