Fixed incorrect use of getManagedChildren (#887)

FXMisc · Dec 31, 2019 · 725f9d0 · 725f9d0
1 parent a227e06
commit 725f9d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java b/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowExt.java
@@ -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;
     }

diff --git a/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java b/richtextfx/src/main/java9/org/fxmisc/richtext/TextFlowLayout.java
@@ -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;
     }
 
@@ -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;