Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 22:10:54 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Animator: added constructor that allows passing a runnable that is invoked at the end of the animation, which allows using lambdas in most cases

Browse Source
This commit is contained in:
Karl Tauber
2020-07-25 10:53:06 +02:00
parent 9f41ec3986
commit 5a9e620c17
3 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
flatlaf-core/src/main/java/com/formdev/flatlaf/util/Animator.java
View File

@@ -31,6 +31,7 @@ public class Animator
private int resolution = 10;
private Interpolator interpolator;
private final ArrayList<TimingTarget> targets = new ArrayList<>();
private final Runnable endRunnable;
private boolean running;
private boolean hasBegun;
@@ -46,7 +47,7 @@ public class Animator
* @param duration the duration of the animation in milliseconds
*/
public Animator( int duration ) {
this( duration, null );
this( duration, null, null );
}
/**
@@ -57,8 +58,21 @@ public class Animator
* @param target the target that receives timing events
*/
public Animator( int duration, TimingTarget target ) {
this( duration, target, null );
}
/**
* Creates an animation that runs duration milliseconds.
* Use {@link #start()} to start the animation.
*
* @param duration the duration of the animation in milliseconds
* @param target the target that receives timing events
* @param endRunnable a runnable invoked when the animation ends; or {@code null}
*/
public Animator( int duration, TimingTarget target, Runnable endRunnable ) {
setDuration( duration );
addTarget( target );
this.endRunnable = endRunnable;
}
/**
@@ -249,6 +263,9 @@ public class Animator
for( TimingTarget target : targets )
target.end();
}
if( endRunnable != null )
endRunnable.run();
}
private void throwExceptionIfRunning() {

28
flatlaf-extras/src/main/java/com/formdev/flatlaf/extras/FlatAnimatedLafChange.java
View File

@@ -115,26 +115,20 @@ public class FlatAnimatedLafChange
return;
// create animator
animator = new Animator( duration, new Animator.TimingTarget() {
@Override
public void timingEvent( float fraction ) {
if( fraction < 0.1 || fraction > 0.9 )
return; // ignore initial and last events
animator = new Animator( duration, fraction -> {
if( fraction < 0.1 || fraction > 0.9 )
return; // ignore initial and last events
alpha = 1f - fraction;
alpha = 1f - fraction;
// repaint snapshots
for( Map.Entry<JLayeredPane, JComponent> e : map.entrySet() ) {
if( e.getKey().isShowing() )
e.getValue().repaint();
}
}
@Override
public void end() {
hideSnapshot();
animator = null;
// repaint snapshots
for( Map.Entry<JLayeredPane, JComponent> e : map.entrySet() ) {
if( e.getKey().isShowing() )
e.getValue().repaint();
}
}, () -> {
hideSnapshot();
animator = null;
} );
animator.setResolution( resolution );

8
flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatAnimatorTest.java
View File

@@ -52,8 +52,8 @@ public class FlatAnimatorTest
linearAnimator.stop();
linearAnimator.start();
} else {
linearAnimator = new Animator( 1000, t -> {
linearScrollBar.setValue( Math.round( t * linearScrollBar.getMaximum() ) );
linearAnimator = new Animator( 1000, fraction -> {
linearScrollBar.setValue( Math.round( fraction * linearScrollBar.getMaximum() ) );
} );
linearAnimator.start();
}
@@ -64,8 +64,8 @@ public class FlatAnimatorTest
easeInOutAnimator.stop();
easeInOutAnimator.start();
} else {
easeInOutAnimator = new Animator( 1000, t -> {
easeInOutScrollBar.setValue( Math.round( t * easeInOutScrollBar.getMaximum() ) );
easeInOutAnimator = new Animator( 1000, fraction -> {
easeInOutScrollBar.setValue( Math.round( fraction * easeInOutScrollBar.getMaximum() ) );
} );
easeInOutAnimator.setInterpolator( CubicBezierEasing.EASE_IN_OUT );
easeInOutAnimator.start();