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

AnimatedPainter added (refactored from AnimatedBorder and AnimatedIcon)

Browse Source 
(checked API compatibility of AnimatedIcon with gradle task sigtestCheck)
This commit is contained in:
Karl Tauber
2021-11-20 11:01:51 +01:00
parent e4fa2e28ea
commit aa6fb2fcce
5 changed files with 325 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatAnimatedBorderTest.java
View File

@@ -140,19 +140,20 @@ public class FlatAnimatedBorderTest
// javax.swing.border.AbstractBorder would be used
@Override
public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
AnimationSupport.paintBorder( this, c, g, x, y, width, height );
paintWithAnimation( c, g, x, y, width, height );
}
@Override
public void paintBorderAnimated( Component c, Graphics g, int x, int y, int width, int height, float animatedValue ) {
public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float animatedValue ) {
FlatUIUtils.setRenderingHints( g );
// border width is 1 if not focused and 2 if focused
float lw = UIScale.scale( 1 + animatedValue );
// paint border
g.setColor( ColorFunctions.mix( Color.red, Color.lightGray, animatedValue ) );
FlatUIUtils.paintComponentBorder( (Graphics2D) g, x, y, width, height, 0, lw, 0 );
Color color = ColorFunctions.mix( Color.red, Color.lightGray, animatedValue );
FlatUIUtils.paintOutlinedComponent( g, x, y, width, height, 0, 0, 0, lw, 0,
null, color, null );
}
@Override
@@ -188,15 +189,15 @@ public class FlatAnimatedBorderTest
// javax.swing.border.AbstractBorder would be used
@Override
public void paintBorder( Component c, Graphics g, int x, int y, int width, int height ) {
AnimationSupport.paintBorder( this, c, g, x, y, width, height );
paintWithAnimation( c, g, x, y, width, height );
}
@Override
public void paintBorderAnimated( Component c, Graphics g, int x, int y, int width, int height, float animatedValue ) {
public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float animatedValue ) {
FlatUIUtils.setRenderingHints( g );
// use paintAtScale1x() for consistent line thickness when scaled
HiDPIUtils.paintAtScale1x( (Graphics2D) g, x, y, width, height,
HiDPIUtils.paintAtScale1x( g, x, y, width, height,
(g2d, x2, y2, width2, height2, scaleFactor) -> {
float lh = (float) (UIScale.scale( 1f ) * scaleFactor);
@@ -214,7 +215,7 @@ public class FlatAnimatedBorderTest
}
@Override
public void repaintBorder( Component c, int x, int y, int width, int height ) {
public void repaintDuringAnimation( Component c, int x, int y, int width, int height ) {
// limit repaint to bottom border
int lh = UIScale.scale( 2 );
c.repaint( x, y + height - lh, width, lh );
@@ -247,7 +248,7 @@ public class FlatAnimatedBorderTest
implements AnimatedBorder
{
@Override
public void paintBorderAnimated( Component c, Graphics g, int x, int y, int width, int height, float animatedValue ) {
public void paintAnimated( Component c, Graphics2D g, int x, int y, int width, int height, float animatedValue ) {
int lh = UIScale.scale( 2 );
g.setColor( Color.blue );