angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Tree: use FlatUIUtils.createPath() in icon painting

Browse Source
This commit is contained in:
Karl Tauber
2019-09-09 16:00:14 +02:00
parent 3fcad9637e
commit 07b26fb548
3 changed files with 8 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeClosedIcon.java
View File

@@ -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
</svg>
*/
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 ) );
}
}

20
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeLeafIcon.java
View File

@@ -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
</svg>
*/
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 ) );
}
}

22
flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatTreeOpenIcon.java
View File

@@ -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
</svg>
*/
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 ) );
}
}