From 0bf87b753d51513782fa71fc584226a3828298a8 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 17 Mar 2022 12:42:49 +0100 Subject: [PATCH] TabbedPane: disable all items in "Show Hidden Tabs" popup menu if tabbed pane is disabled --- CHANGELOG.md | 2 ++ .../src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef566328..3f6fbfc6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,8 @@ FlatLaf Change Log (issue #493) - TextArea, TextPane and EditorPane: No longer select all text when component is focused for the first time. (issue #498; regression in FlatLaf 2.0) +- TabbedPane: Disable all items in "Show Hidden Tabs" popup menu if tabbed pane + is disabled. #### Incompatibilities diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java index d3aeaf43..9a2cdda7 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTabbedPaneUI.java @@ -2016,7 +2016,7 @@ public class FlatTabbedPaneUI menuItem.setOpaque( true ); } - if( !tabPane.isEnabledAt( tabIndex ) ) + if( !tabPane.isEnabled() || !tabPane.isEnabledAt( tabIndex ) ) menuItem.setEnabled( false ); menuItem.addActionListener( e -> selectTab( tabIndex ) );