From 625c0a3321e60d8a88e33e9cdb11335643a14c3a Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 19 Feb 2024 22:12:29 +0100 Subject: [PATCH] Tree: detect tree cell editor in FlatUIUtils.isCellEditor() --- .../src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java index fed908b1..17707c76 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatUIUtils.java @@ -60,6 +60,7 @@ import javax.swing.border.Border; import javax.swing.border.CompoundBorder; import javax.swing.plaf.ComponentUI; import javax.swing.plaf.UIResource; +import javax.swing.tree.DefaultTreeCellEditor; import com.formdev.flatlaf.FlatClientProperties; import com.formdev.flatlaf.FlatIntelliJLaf; import com.formdev.flatlaf.FlatLaf; @@ -304,6 +305,10 @@ public class FlatUIUtils if( parent instanceof JTable && ((JTable)parent).getEditorComponent() == c ) return true; + // check whether used as tree cell editor + if( parent instanceof DefaultTreeCellEditor.EditorContainer ) + return true; + // check whether used as cell editor // Table.editor is set in JTable.GenericEditor constructor // Tree.cellEditor is set in sun.swing.FilePane.editFileName()