Invalidate baseline source when child prefBaseline is changed

Author: mstr2

modules/javafx.controls/src/main/java/javafx/scene/control/Labeled.java

@@ -661,7 +661,7 @@ public final ObjectProperty<ContentDisplay> contentDisplayProperty() {
             contentDisplay = new StyleableObjectProperty<ContentDisplay>(ContentDisplay.LEFT) {
                 @Override
                 protected void invalidated() {
-                    ParentHelper.notifyTextBaselineChanged(Labeled.this);
+                    ParentHelper.notifyBaselineSourceChanged(Labeled.this);
                     ParentHelper.notifyBaselineOffsetChanged(Labeled.this);
                 }
 

modules/javafx.graphics/src/main/java/com/sun/javafx/scene/ParentHelper.java

@@ -121,8 +121,8 @@ public static ParentTraversalEngine getTraversalEngine(Parent parent) {
         return parentAccessor.getTraversalEngine(parent);
     }
 
-    public static void notifyTextBaselineChanged(Parent parent) {
-        parentAccessor.notifyTextBaselineChanged(parent);
+    public static void notifyBaselineSourceChanged(Parent parent) {
+        parentAccessor.notifyBaselineSourceChanged(parent);
     }
 
     public static void setParentAccessor(final ParentAccessor newAccessor) {
@@ -144,7 +144,7 @@ public interface ParentAccessor {
         void setTraversalEngine(Parent parent, ParentTraversalEngine value);
         ParentTraversalEngine getTraversalEngine(Parent parent);
         List<String> doGetAllParentStylesheets(Parent parent);
-        void notifyTextBaselineChanged(Parent parent);
+        void notifyBaselineSourceChanged(Parent parent);
     }
 
 }

modules/javafx.graphics/src/main/java/javafx/scene/Node.java

@@ -149,6 +149,7 @@
 import com.sun.javafx.scene.LayoutFlags;
 import com.sun.javafx.scene.NodeEventDispatcher;
 import com.sun.javafx.scene.NodeHelper;
+import com.sun.javafx.scene.ParentHelper;
 import com.sun.javafx.scene.SceneHelper;
 import com.sun.javafx.scene.SceneUtils;
 import com.sun.javafx.scene.input.PickResultChooser;
@@ -3196,6 +3197,15 @@ public void resizeRelocate(double x, double y, double width, double height) {
     public final BooleanProperty prefBaselineProperty() {
         if (prefBaseline == null) {
             prefBaseline = new BooleanPropertyBase() {
+                @Override
+                protected void invalidated() {
+                    Parent parent = getParent();
+                    if (parent != null) {
+                        ParentHelper.notifyBaselineSourceChanged(parent);
+                        requestParentLayout(true);
+                    }
+                }
+
                 @Override
                 public Object getBean() {
                     return Node.this;

modules/javafx.graphics/src/main/java/javafx/scene/Parent.java

@@ -161,8 +161,8 @@ public List<String> doGetAllParentStylesheets(Parent parent) {
             }
 
             @Override
-            public void notifyTextBaselineChanged(Parent parent) {
-                parent.notifyTextBaselineChanged();
+            public void notifyBaselineSourceChanged(Parent parent) {
+                parent.notifyBaselineSourceChanged();
             }
         });
     }
@@ -1276,12 +1276,12 @@ private Node getBaselineSource() {
         return null;
     }
 
-    private void notifyTextBaselineChanged() {
+    private void notifyBaselineSourceChanged() {
         cachedBaselineSourceValid = false;
         cachedBaselineSource = null;
         Parent parent = getParent();
         if (parent != null) {
-            parent.notifyTextBaselineChanged();
+            parent.notifyBaselineSourceChanged();
         }
     }