big ComboBox refactors, phetsims/sun#430, phetsims/sun#428, phetsims/…

…sun#419
phetsims · Jan 15, 2019 · ebf8f5d · ebf8f5d
1 parent e45bda7
commit ebf8f5d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/js/common/GasPropertiesConstants.js b/js/common/GasPropertiesConstants.js
@@ -21,14 +21,11 @@ define( require => {
     SIM_TIME_STEP: 0.2, // ps
 
     COMBO_BOX_OPTIONS: {
-      itemHighlightFill: 'rgba( 255, 0, 0, 0.1 )',
+      highlightFill: 'rgba( 255, 0, 0, 0.1 )',
       align: 'right',
-      buttonXMargin: 5,
-      buttonYMargin: 2,
-      buttonCornerRadius: 5,
-      itemXMargin: 2,
-      itemYMargin: 2,
-      buttonLineWidth: 0.4
+      cornerRadius: 5,
+      xMargin: 5,
+      yMargin: 4
     },
 
     // Options common to all NumberDisplay items that are used in ComboBoxes

diff --git a/js/common/view/CollisionCounterNode.js b/js/common/view/CollisionCounterNode.js
@@ -96,11 +96,9 @@ define( require => {
       const comboBox = new ComboBox( comboBoxItems, collisionCounter.averagingTimeProperty, comboBoxListParent, {
         listPosition: 'below',
         align: 'right',
-        buttonXMargin: 5,
-        buttonYMargin: 2,
-        buttonCornerRadius: 5,
-        itemXMargin: 2,
-        itemYMargin: 2
+        xMargin: 6,
+        yMargin: 3,
+        cornerRadius: 5
       } );
 
       // all of the stuff that appear on the counter

diff --git a/js/common/view/PressureDisplay.js b/js/common/view/PressureDisplay.js
@@ -11,6 +11,7 @@ define( require => {
   // modules
   const ComboBoxDisplay = require( 'SCENERY_PHET/ComboBoxDisplay' );
   const gasProperties = require( 'GAS_PROPERTIES/gasProperties' );
+  const GasPropertiesConstants = require( 'GAS_PROPERTIES/common/GasPropertiesConstants' );
   const PressureGauge = require( 'GAS_PROPERTIES/common/model/PressureGauge' );
   const Range = require( 'DOT/Range' );
 
@@ -30,6 +31,8 @@ define( require => {
      */
     constructor( pressureGauge, listParent, options ) {
 
+      options = _.extend( {}, GasPropertiesConstants.COMBO_BOX_OPTIONS, options );
+
       const items = [
         {
           choice: PressureGauge.Units.KILOPASCALS,

diff --git a/js/common/view/TemperatureDisplay.js b/js/common/view/TemperatureDisplay.js
@@ -11,6 +11,7 @@ define( require => {
   // modules
   const ComboBoxDisplay = require( 'SCENERY_PHET/ComboBoxDisplay' );
   const gasProperties = require( 'GAS_PROPERTIES/gasProperties' );
+  const GasPropertiesConstants = require( 'GAS_PROPERTIES/common/GasPropertiesConstants' );
   const Range = require( 'DOT/Range' );
   const Thermometer = require( 'GAS_PROPERTIES/common/model/Thermometer' );
 
@@ -30,6 +31,8 @@ define( require => {
      */
     constructor( thermometer, listParent, options ) {
 
+      options = _.extend( {}, GasPropertiesConstants.COMBO_BOX_OPTIONS, options );
+
       const items = [
         {
           choice: Thermometer.Units.KELVIN,