Merge pull request #2337 from jmoenig/vector-edit

fix pipette bug

src/paint.js

@@ -495,6 +495,7 @@ PaintEditorMorph.prototype.getUserColor = function () {
     var myself = this,
         world = this.world(),
         hand = world.hand,
+        shifted = this.paper.isShiftPressed();
         posInDocument = getDocumentPositionOf(world.worldCanvas),
         mouseMoveBak = hand.processMouseMove,
         mouseDownBak = hand.processMouseDown,
@@ -513,7 +514,7 @@ PaintEditorMorph.prototype.getUserColor = function () {
             return;
         }
         color.a = 255;
-        myself.propertiesControls.colorpicker.action(color);
+        myself.propertiesControls.colorpicker.action(color, shifted);
     };
 
     hand.processMouseDown = nop;

src/sketch.js

@@ -1223,9 +1223,9 @@ VectorPaintEditorMorph.prototype.buildToolbox = function () {
             polygon:
                 'Polygon',
             paintbucket:
-                'Paint a shape\n(shift: secondary color)',
+                'Paint a shape\n(shift: edge color)',
             pipette:
-                'Pipette tool\n(pick a color from anywhere\nshift: secondary color)'
+                'Pipette tool\n(pick a color from anywhere\nshift: fill color)'
         },
         myself = this,
         left = this.toolbox.left(),
@@ -1347,7 +1347,7 @@ VectorPaintEditorMorph.prototype.populatePropertiesMenu = function () {
     alignNames.add(new TextMorph(localize('Edge color\n(left click)'),
 				 null, null, null, null,
 				 'center', 85));
-    alignNames.add(new TextMorph(localize('Fill color\n(rigth click)'),
+    alignNames.add(new TextMorph(localize('Fill color\n(right click)'),
 				 null, null, null, null,
 				 'center', 85));
     alignNames.fixLayout();