handle maxWidth for undefined slope labels, #114

phetsims · Feb 5, 2019 · b5d381f · b5d381f
1 parent 26689cc
commit b5d381f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/js/pointslope/view/PointSlopeEquationNode.js b/js/pointslope/view/PointSlopeEquationNode.js
@@ -146,7 +146,9 @@ define( function( require ) {
       x1Node = new DynamicValueNode( x1Property, _.extend( { absoluteValue: true }, staticOptions ) );
     }
     var xRightParenNode = new Text( ')', staticOptions );
-    var slopeUndefinedNode = new RichText( '?', staticOptions );
+    var slopeUndefinedNode = new RichText( '?', _.extend( {}, staticOptions, {
+      maxWidth: options.maxWidth // see #114
+    } ) );
 
     // add all nodes, we'll set which ones are visible bases on desired simplification
     self.children = [

diff --git a/js/slope/view/SlopeEquationNode.js b/js/slope/view/SlopeEquationNode.js
@@ -373,15 +373,14 @@ define( function( require ) {
 
     // allocate nodes needed to represent all simplified forms
     var slopeIsNode = new Text( slopeIsString, textOptions );
-    var undefinedNode = new Text( undefinedString, textOptions );
     var minusSignNode = new MinusNode( { size: this.signLineSize } );
     var riseNode = new Text( '?', textOptions );
     var runNode = new Text( '?', textOptions );
     var fractionLineNode = new scenery.Line( 0, 0, 1, 0, { lineWidth: this.fractionLineThickness } );
 
     // add all nodes, we'll set which ones are visible bases on desired simplification
     assert && assert( this.getChildrenCount() === 0, 'supertype has unexpected children' );
-    this.children = [ slopeIsNode, undefinedNode, minusSignNode, riseNode, runNode, fractionLineNode ];
+    this.children = [ slopeIsNode, minusSignNode, riseNode, runNode, fractionLineNode ];
 
     // update visibility, layout and properties of nodes to match the current line
     var update = function( line ) {
@@ -400,10 +399,11 @@ define( function( require ) {
 
       if ( line.undefinedSlope() ) {
         // 'undefined'
-        undefinedNode.visible = true;
-        undefinedNode.fill = lineColor;
-        undefinedNode.left = slopeIsNode.right + self.relationalOperatorXSpacing;
-        undefinedNode.y = slopeIsNode.y;
+        riseNode.visible = true;
+        riseNode.text = undefinedString;
+        riseNode.fill = lineColor;
+        riseNode.left = slopeIsNode.right + self.relationalOperatorXSpacing;
+        riseNode.y = slopeIsNode.y;
       }
       else if ( line.getSlope() === 0 ) {
         // 0

diff --git a/js/slopeintercept/view/SlopeInterceptEquationNode.js b/js/slopeintercept/view/SlopeInterceptEquationNode.js
@@ -140,7 +140,9 @@ define( function( require ) {
     }
     var yInterceptDenominatorNode = new DynamicValueNode( yInterceptDenominatorProperty, _.extend( { absoluteValue: true }, staticOptions ) );
     var yInterceptFractionLineNode = new scenery.Line( 0, 0, maxSlopePickerWidth, 0, fractionLineOptions );
-    var slopeUndefinedNode = new RichText( '?', staticOptions );
+    var slopeUndefinedNode = new RichText( '?', _.extend( {}, staticOptions, {
+      maxWidth: options.maxWidth // see #114
+    } ) );
 
     // add all nodes, we'll set which ones are visible bases on desired simplification
     self.children = [ yNode, equalsNode, slopeMinusSignNode, riseNode, runNode, slopeFractionLineNode, xNode, plusNode, minusNode,