adjusting default options in ZoomButtonGroup hierarchy, #653

phetsims · Dec 17, 2020 · 239c814 · 239c814
1 parent 7e7e5bd
commit 239c814
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/js/MagnifyingGlassZoomButtonGroup.js b/js/MagnifyingGlassZoomButtonGroup.js
@@ -4,6 +4,7 @@ import Dimension2 from '../../dot/js/Dimension2.js';
 import merge from '../../phet-core/js/merge.js';
 import MagnifyingGlassNode from './MagnifyingGlassNode.js';
 import MinusNode from './MinusNode.js';
+import PhetColorScheme from './PhetColorScheme.js';
 import PlusNode from './PlusNode.js';
 import sceneryPhet from './sceneryPhet.js';
 import ZoomButtonGroup from './ZoomButtonGroup.js';
@@ -21,8 +22,11 @@ class MagnifyingGlassZoomButtonGroup extends ZoomButtonGroup {
   constructor( zoomLevelProperty, options ) {
 
     options = merge( {
+      buttonOptions: {
+        baseColor: PhetColorScheme.BUTTON_YELLOW // like ZoomButton
+      },
       magnifyingGlassNodeOptions: {
-        glassRadius: 10
+        glassRadius: 15 // like ZoomButton
       }
     }, options );
 

diff --git a/js/PlusMinusZoomButtonGroup.js b/js/PlusMinusZoomButtonGroup.js
@@ -4,6 +4,7 @@ import Dimension2 from '../../dot/js/Dimension2.js';
 import merge from '../../phet-core/js/merge.js';
 import AlignBox from '../../scenery/js/nodes/AlignBox.js';
 import AlignGroup from '../../scenery/js/nodes/AlignGroup.js';
+import ButtonNode from '../../sun/js/buttons/ButtonNode.js';
 import MinusNode from './MinusNode.js';
 import PlusNode from './PlusNode.js';
 import sceneryPhet from './sceneryPhet.js';
@@ -27,7 +28,9 @@ class PlusMinusZoomButtonGroup extends ZoomButtonGroup {
     options = merge( {
       buttonOptions: {
         xMargin: 9,
-        yMargin: 10
+        yMargin: 10,
+        cornerRadius: 0,
+        buttonAppearanceStrategy: ButtonNode.FlatAppearanceStrategy
       },
       iconOptions: {
         size: DEFAULT_ICON_SIZE

diff --git a/js/ZoomButtonGroup.js b/js/ZoomButtonGroup.js
@@ -11,7 +11,6 @@ import NumberProperty from '../../axon/js/NumberProperty.js';
 import merge from '../../phet-core/js/merge.js';
 import LayoutBox from '../../scenery/js/nodes/LayoutBox.js';
 import Node from '../../scenery/js/nodes/Node.js';
-import ButtonNode from '../../sun/js/buttons/ButtonNode.js';
 import RectangularPushButton from '../../sun/js/buttons/RectangularPushButton.js';
 import Tandem from '../../tandem/js/Tandem.js';
 import sceneryPhet from './sceneryPhet.js';
@@ -45,10 +44,6 @@ class ZoomButtonGroup extends LayoutBox {
       // RectangularPushButton options
       buttonOptions: {
         baseColor: 'white',
-        buttonAppearanceStrategy: ButtonNode.FlatAppearanceStrategy,
-        cornerRadius: 0,
-        xMargin: 8,
-        yMargin: 5,
         fireOnHold: true,
         fireOnHoldDelay: 600, // ms
         fireOnHoldInterval: 250 // ms