Skip to content

Fixed incorrect use of getManagedChildren #887

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.

Sign up for GitHub

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

Merged
Jugen merged 1 commit into from
Dec 31, 2019
Merged

Fixed incorrect use of getManagedChildren #887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class TextFlowExt extends TextFlow {
private TextFlowLayout textLayout()
{
if ( layout == null ) {
layout = new TextFlowLayout( this, getManagedChildren() );
layout = new TextFlowLayout( this );
}
return layout;
}
Expand Down
6 changes: 2 additions & 4 deletions richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@
class TextFlowLayout
{
private TextFlow flow;
private List<Node> children;
private List<TextFlowSpan> lineMetrics = new ArrayList<>();
private int lineCount = -1;

TextFlowLayout( TextFlow tf, List<Node> managedChildren ) {
TextFlowLayout( TextFlow tf ) {
tf.getChildren().addListener( (Observable ob) -> lineCount = -1 );
tf.widthProperty().addListener( (Observable ob) -> lineCount = -1 );
children = managedChildren;
flow = tf;
}

Expand Down Expand Up @@ -73,7 +71,7 @@ int getLineCount() {
double totLines = 0.0, prevMinY = 1.0, prevMaxY = -1.0;
int totCharSoFar = 0;

for ( Node n : children ) {
for ( Node n : flow.getChildren() ) if ( n.isManaged() ) {

Bounds nodeBounds = n.getBoundsInParent();
int length = (n instanceof Text) ? ((Text) n).getText().length() : 1;
Expand Down
⚡