Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8332895: Support interpolation for backgrounds and borders #1522

Closed
wants to merge 67 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
25bcb1d
Add interpolation support for backgrounds and borders
mstr2 Jun 2, 2024
e795fd0
add since tags
mstr2 Jun 4, 2024
bb84c57
clean up imports
mstr2 Jun 4, 2024
4f363a4
Merge branch 'master' into feature/interpolatable
mstr2 Jul 4, 2024
e7e5fac
added specification and tests
mstr2 Jul 4, 2024
3221441
added more tests
mstr2 Jul 4, 2024
5f63c28
revert change
mstr2 Jul 4, 2024
47e55bf
revert change
mstr2 Jul 4, 2024
1cebcc1
add exports
mstr2 Jul 4, 2024
831cf6b
add specification
mstr2 Jul 4, 2024
1efce84
change documentation
mstr2 Jul 4, 2024
12a73d5
add documentation to Point2D/3D
mstr2 Jul 4, 2024
08ed751
fix line separators
mstr2 Jul 4, 2024
6dbefb8
ComponentTransitionable implementation
mstr2 Jul 30, 2024
bbfb025
fix line separators
mstr2 Jul 30, 2024
ab8480a
Merge branch 'master' into feature/interpolatable
mstr2 Jul 30, 2024
1cc8db8
add tests
mstr2 Jul 30, 2024
7650fea
documentation
mstr2 Jul 30, 2024
94d6a90
fix line separators
mstr2 Jul 30, 2024
675bc7f
fixed a bug
mstr2 Jul 31, 2024
64e4f17
adjust table styling
mstr2 Aug 2, 2024
7a92bbf
fix since tag
mstr2 Aug 2, 2024
8f53f3a
add test for inherited transitions
mstr2 Aug 2, 2024
bd4c2c3
remove redundant null initialization
mstr2 Aug 2, 2024
3b8fa91
update documentation
mstr2 Aug 2, 2024
10705a3
address review comments
mstr2 Aug 2, 2024
3d12f77
use switch instead of nested if
mstr2 Aug 3, 2024
6667dd5
use switch instead of nested if
mstr2 Aug 3, 2024
14e91f1
fix trailing whitespace
mstr2 Aug 3, 2024
4257d2f
move interpolation helpers to separate file
mstr2 Aug 4, 2024
843713b
added comments
mstr2 Aug 4, 2024
0def5d1
move tests
mstr2 Aug 4, 2024
3437267
remove ComponentTransitionable
mstr2 Aug 4, 2024
b545617
add tests
mstr2 Aug 4, 2024
a2d0d6c
add test for stop lists
mstr2 Aug 4, 2024
d7f2187
use HashMap.newHashMap()
mstr2 Aug 4, 2024
2f03e13
add export
mstr2 Aug 6, 2024
eb9700a
Merge branch 'refs/heads/master' into feature/interpolatable
mstr2 Aug 6, 2024
61d595f
replace StyleConverter.SupportsDeconstruction interface with annotation
mstr2 Aug 6, 2024
c36c6c0
interpolate integers in real number space
mstr2 Aug 7, 2024
03c5496
replace reconstruction annotation with interface
mstr2 Aug 7, 2024
2bc0000
add more documentation
mstr2 Aug 8, 2024
1abd688
only call get() when necessary
mstr2 Aug 8, 2024
abef432
non-interpolatable values should always transition discretely
mstr2 Aug 9, 2024
7288fcc
StyleableStringProperty should be transitionable
mstr2 Aug 9, 2024
a0557b8
fix line separators
mstr2 Aug 9, 2024
9bdea0a
remove StyleConverter.WithReconstructionSupport
mstr2 Aug 9, 2024
2337ca9
Merge branch 'master' into feature/interpolatable
mstr2 Sep 1, 2024
6218e9a
address review comments
mstr2 Sep 3, 2024
74b23c4
typo
mstr2 Sep 3, 2024
ba375b5
refactoring
mstr2 Sep 3, 2024
97ee29e
changes per review
mstr2 Sep 5, 2024
7328daa
address review comments
mstr2 Sep 5, 2024
9b7f2a5
javadoc changes
mstr2 Sep 5, 2024
d884a56
added tests
mstr2 Sep 5, 2024
75e7d98
javadoc changes
mstr2 Sep 5, 2024
acdec11
fixed a bug when null values require discrete transitions
mstr2 Sep 6, 2024
f9187a1
small doc changes, copyright header
mstr2 Sep 8, 2024
c9cf139
javadoc change
mstr2 Sep 14, 2024
1227a79
javadoc change
mstr2 Sep 14, 2024
1c842cc
javadoc change
mstr2 Sep 16, 2024
6b90089
Merge branch 'master' into feature/interpolatable
mstr2 Sep 25, 2024
3027caa
fix merge conflicts
mstr2 Sep 25, 2024
bb0cc60
documentation changes
mstr2 Sep 27, 2024
e3792cc
documentation changes
mstr2 Sep 27, 2024
7d086cf
removed unnecessary imports
mstr2 Sep 27, 2024
332a5c1
added @deprecated javadoc tag
mstr2 Sep 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@

package com.sun.javafx.scene.layout.region;

import com.sun.javafx.util.Utils;
import com.sun.javafx.util.InterpolationUtils;
import javafx.animation.Interpolatable;
import javafx.scene.layout.BorderWidths;
import java.util.Objects;
@@ -69,7 +69,7 @@ public BorderImageSlices interpolate(BorderImageSlices endValue, double t) {

return new BorderImageSlices(
widths.interpolate(endValue.widths, t),
Utils.interpolateDiscrete(filled, endValue.filled, t));
InterpolationUtils.interpolateDiscrete(filled, endValue.filled, t));
}

@Override
Original file line number Diff line number Diff line change
@@ -25,6 +25,7 @@

package com.sun.javafx.scene.layout.region;

import com.sun.javafx.util.InterpolationUtils;
import javafx.animation.Interpolatable;
import javafx.scene.text.Font;
import javafx.css.Size;
@@ -33,7 +34,6 @@
import javafx.css.StyleConverter;
import com.sun.javafx.logging.PlatformLogger;
import com.sun.javafx.logging.PlatformLogger.Level;
import com.sun.javafx.util.Utils;
import java.util.Objects;

/**
@@ -85,14 +85,14 @@ public Margins interpolate(Margins endValue, double t) {
}

if (proportional != endValue.proportional) {
return Utils.interpolateDiscrete(this, endValue, t);
return InterpolationUtils.interpolateDiscrete(this, endValue, t);
}

return new Margins(
Utils.interpolate(top, endValue.top, t),
Utils.interpolate(right, endValue.right, t),
Utils.interpolate(bottom, endValue.bottom, t),
Utils.interpolate(left, endValue.left, t),
InterpolationUtils.interpolate(top, endValue.top, t),
InterpolationUtils.interpolate(right, endValue.right, t),
InterpolationUtils.interpolate(bottom, endValue.bottom, t),
InterpolationUtils.interpolate(left, endValue.left, t),
proportional);
}

This file was deleted.

Loading