Removing pointer type shortcuts, see phetsims/scenery#724

phetsims · Jan 17, 2018 · 5333673 · 5333673
1 parent 47434e1
commit 5333673
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/js/proportional/model/ProportionalAreaModel.js b/js/proportional/model/ProportionalAreaModel.js
@@ -36,7 +36,7 @@ define( function( require ) {
     this.tilesVisibleProperty = new BooleanProperty( false );
 
     // @public {BooleanProperty}
-    this.countsVisibleProperty = new BooleanProperty( false );
+    this.countsVisibleProperty = new BooleanProperty( true );
   }
 
   areaModelCommon.register( 'ProportionalAreaModel', ProportionalAreaModel );

diff --git a/js/proportional/view/ProportionalAreaScreenView.js b/js/proportional/view/ProportionalAreaScreenView.js
@@ -63,7 +63,20 @@ define( function( require ) {
     } );
 
     model.currentAreaProperty.link( function( area ) {
-      checkboxContainer.children = [ gridCheckbox ].concat( area.countingAvailable ? [ countingCheckbox ] : [] ).concat( area.tilesAvailable ? [ tileCheckbox ] : [] );
+      // TODO: some cleanup?
+      var children = [];
+
+      // Don't show the grid/tiles checkboxes if counting is enabled
+      if ( !area.countingAvailable ) {
+        children.push( gridCheckbox );
+        if ( area.tilesAvailable ) {
+          children.push( tileCheckbox );
+        }
+      }
+      else {
+        children.push( countingCheckbox );
+      }
+      checkboxContainer.children = children;
     } );
 
     this.addChild( checkboxContainer );