From 07b26fb548685ece36477ad971cc600c90a570c2 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 9 Sep 2019 16:00:14 +0200 Subject: [PATCH] Tree: use FlatUIUtils.createPath() in icon painting --- .../flatlaf/icons/FlatTreeClosedIcon.java | 12 ++-------- .../flatlaf/icons/FlatTreeLeafIcon.java | 20 +++-------------- .../flatlaf/icons/FlatTreeOpenIcon.java | 22 +++---------------- 3 files changed, 8 insertions(+), 46 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeClosedIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeClosedIcon.java index 292807d4..04b60c22 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeClosedIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeClosedIcon.java @@ -18,8 +18,8 @@ package com.formdev.flatlaf.icons; import java.awt.Component; import java.awt.Graphics2D; -import java.awt.geom.Path2D; import javax.swing.UIManager; +import com.formdev.flatlaf.ui.FlatUIUtils; /** * "closed" icon for {@link javax.swing.JTree} used by {@link javax.swing.tree.DefaultTreeCellRenderer}. @@ -43,14 +43,6 @@ public class FlatTreeClosedIcon */ - Path2D arrow = new Path2D.Float(); - arrow.moveTo( 1, 2 ); - arrow.lineTo( 6, 2 ); - arrow.lineTo( 8, 4 ); - arrow.lineTo( 15, 4 ); - arrow.lineTo( 15, 13 ); - arrow.lineTo( 1, 13 ); - arrow.closePath(); - g.fill( arrow ); + g.fill( FlatUIUtils.createPath( 1,2, 6,2, 8,4, 15,4, 15,13, 1,13 ) ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeLeafIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeLeafIcon.java index 21b01dc9..c934d978 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeLeafIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeLeafIcon.java @@ -18,8 +18,8 @@ package com.formdev.flatlaf.icons; import java.awt.Component; import java.awt.Graphics2D; -import java.awt.geom.Path2D; import javax.swing.UIManager; +import com.formdev.flatlaf.ui.FlatUIUtils; /** * "leaf" icon for {@link javax.swing.JTree} used by {@link javax.swing.tree.DefaultTreeCellRenderer}. @@ -46,21 +46,7 @@ public class FlatTreeLeafIcon */ - Path2D arrow = new Path2D.Float(); - arrow.moveTo( 8, 6 ); - arrow.lineTo( 8, 1 ); - arrow.lineTo( 13, 1 ); - arrow.lineTo( 13, 15 ); - arrow.lineTo( 3, 15 ); - arrow.lineTo( 3, 6 ); - arrow.closePath(); - g.fill( arrow ); - - arrow = new Path2D.Float(); - arrow.moveTo( 3, 5 ); - arrow.lineTo( 7, 5 ); - arrow.lineTo( 7, 1 ); - arrow.closePath(); - g.fill( arrow ); + g.fill( FlatUIUtils.createPath( 8,6, 8,1, 13,1, 13,15, 3,15, 3,6 ) ); + g.fill( FlatUIUtils.createPath( 3,5, 7,5, 7,1 ) ); } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java index 9f022db7..2eb6d4f9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java @@ -18,8 +18,8 @@ package com.formdev.flatlaf.icons; import java.awt.Component; import java.awt.Graphics2D; -import java.awt.geom.Path2D; import javax.swing.UIManager; +import com.formdev.flatlaf.ui.FlatUIUtils; /** * "open" icon for {@link javax.swing.JTree} used by {@link javax.swing.tree.DefaultTreeCellRenderer}. @@ -46,23 +46,7 @@ public class FlatTreeOpenIcon */ - Path2D arrow = new Path2D.Float(); - arrow.moveTo( 1, 2 ); - arrow.lineTo( 6, 2 ); - arrow.lineTo( 8, 4 ); - arrow.lineTo( 14, 4 ); - arrow.lineTo( 14, 6 ); - arrow.lineTo( 3.5, 6 ); - arrow.lineTo( 1, 11 ); - arrow.closePath(); - g.fill( arrow ); - - arrow = new Path2D.Float(); - arrow.moveTo( 4, 7 ); - arrow.lineTo( 16, 7 ); - arrow.lineTo( 13, 13 ); - arrow.lineTo( 1, 13 ); - arrow.closePath(); - g.fill( arrow ); + g.fill( FlatUIUtils.createPath( 1,2, 6,2, 8,4, 14,4, 14,6, 3.5,6, 1,11 ) ); + g.fill( FlatUIUtils.createPath( 4,7, 16,7, 13,13, 1,13 ) ); } }