Merge remote-tracking branch 'origin/master'

phetsims · Jan 17, 2019 · aa2d1b8 · aa2d1b8
2 parents 9dab6e7 + b48638f
commit aa2d1b8
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/js/common/view/MediumControlPanel.js b/js/common/view/MediumControlPanel.js
@@ -16,6 +16,7 @@ define( function( require ) {
   var BendingLightConstants = require( 'BENDING_LIGHT/common/BendingLightConstants' );
   var Bounds2 = require( 'DOT/Bounds2' );
   var ComboBox = require( 'SUN/ComboBox' );
+  var ComboBoxItem = require( 'SUN/ComboBoxItem' );
   var Dimension2 = require( 'DOT/Dimension2' );
   var DispersionFunction = require( 'BENDING_LIGHT/common/model/DispersionFunction' );
   var HSlider = require( 'SUN/HSlider' );
@@ -104,7 +105,7 @@ define( function( require ) {
         itemName.scale( comboBoxTextWidth / itemName.width );
       }
 
-      return ComboBox.createItem( itemName, item );
+      return new ComboBoxItem( itemName, item );
     };
     // states to choose from (and indicate) in the combo box
     var substances = [
@@ -152,7 +153,7 @@ define( function( require ) {
       labelNode: materialTitle,
       listPosition: options.comboBoxListPosition,
       xMargin: 7,
-      yMargin: 4,
+      yMargin: 7,
       arrowHeight: 6,
       cornerRadius: 3
     } );