diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java index 8acd44e8..4527270a 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatTreeUI.java @@ -76,6 +76,11 @@ import com.formdev.flatlaf.util.UIScale; * @uiDefault Tree.dropCellBackground Color * @uiDefault Tree.dropCellForeground Color * + * + * + * @uiDefault Tree.editorBorder Border + * @uiDefault Tree.editorBorderSelectionColor Color + * * * * @uiDefault Tree.border Border diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index 0c7cafe1..e8cae40a 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -292,6 +292,7 @@ List.selectionInactiveForeground=@selectionInactiveForeground List.dropCellBackground=@dropCellBackground List.dropCellForeground=@dropCellForeground List.dropLineColor=@dropLineColor +List.showCellFocusIndicator=false #---- Menu ---- @@ -660,6 +661,7 @@ ToolTipManager.enableToolTipMode=activeApplication #---- Tree ---- Tree.border=1,1,1,1 +Tree.editorBorder=1,1,1,1,@cellFocusColor Tree.selectionInactiveBackground=@selectionInactiveBackground Tree.selectionInactiveForeground=@selectionInactiveForeground Tree.textBackground=$Tree.background @@ -672,6 +674,7 @@ Tree.rendererMargins=1,2,1,2 Tree.wideSelection=true Tree.repaintWholeRow=true Tree.paintLines=false +Tree.showCellFocusIndicator=false Tree.leftChildIndent=7 Tree.rightChildIndent=11 Tree.rowHeight=0 diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties index 70a76ca6..a02f7248 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/FlatTestLaf.properties @@ -348,3 +348,5 @@ ToolTip.background=#eeeeff Tree.background=#fff0ff Tree.paintLines=true Tree.hash=#ff0000 +Tree.editorBorder=1,1,1,1,#f00 +Tree.editorBorderSelectionColor=#00f diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index e8ee42ae..f376be3d 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -475,6 +475,7 @@ List.selectionBackground #4b6eaf javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #0d293e javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] +List.showCellFocusIndicator false List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -1190,7 +1191,7 @@ Tree.drawsFocusBorderAroundIcon false Tree.dropCellBackground [lazy] #3c588b javax.swing.plaf.ColorUIResource [UI] Tree.dropCellForeground [lazy] #bbbbbb javax.swing.plaf.ColorUIResource [UI] Tree.dropLineColor [lazy] #6d8ac0 javax.swing.plaf.ColorUIResource [UI] -Tree.editorBorder [lazy] line: #000000 java.awt.Color 1 false 1,1,1,1 true javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI] +Tree.editorBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#000000 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 Tree.expandedIcon [lazy] 11,11 com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI] Tree.font [active] $defaultFont [UI] Tree.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] @@ -1216,6 +1217,7 @@ Tree.selectionBorderColor #000000 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveBackground #0d293e javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] +Tree.showCellFocusIndicator false Tree.textBackground #45494a javax.swing.plaf.ColorUIResource [UI] Tree.textForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Tree.timeFactor 1000 diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index f0ab10cb..7f24a06f 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -480,6 +480,7 @@ List.selectionBackground #2675bf javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveBackground #d4d4d4 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #000000 javax.swing.plaf.ColorUIResource [UI] +List.showCellFocusIndicator false List.timeFactor 1000 ListUI com.formdev.flatlaf.ui.FlatListUI @@ -1195,7 +1196,7 @@ Tree.drawsFocusBorderAroundIcon false Tree.dropCellBackground [lazy] #3f8fd9 javax.swing.plaf.ColorUIResource [UI] Tree.dropCellForeground [lazy] #ffffff javax.swing.plaf.ColorUIResource [UI] Tree.dropLineColor [lazy] #6aa7e1 javax.swing.plaf.ColorUIResource [UI] -Tree.editorBorder [lazy] line: #000000 java.awt.Color 1 false 1,1,1,1 true javax.swing.plaf.BorderUIResource$LineBorderUIResource [UI] +Tree.editorBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatLineBorder [UI] lineColor=#000000 javax.swing.plaf.ColorUIResource [UI] lineThickness=1.000000 Tree.expandedIcon [lazy] 11,11 com.formdev.flatlaf.icons.FlatTreeExpandedIcon [UI] Tree.font [active] $defaultFont [UI] Tree.foreground #000000 javax.swing.plaf.ColorUIResource [UI] @@ -1221,6 +1222,7 @@ Tree.selectionBorderColor #000000 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #ffffff javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveBackground #d4d4d4 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveForeground #000000 javax.swing.plaf.ColorUIResource [UI] +Tree.showCellFocusIndicator false Tree.textBackground #ffffff javax.swing.plaf.ColorUIResource [UI] Tree.textForeground #000000 javax.swing.plaf.ColorUIResource [UI] Tree.timeFactor 1000