[squeak-dev] The Trunk: Morphic-eem.1354.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Oct 27 01:19:37 UTC 2017


Eliot Miranda uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-eem.1354.mcz

==================== Summary ====================

Name: Morphic-eem.1354
Author: eem
Time: 26 October 2017, 6:19:15.4235 pm
UUID: c23cb387-6977-4e21-9a27-f70292843182
Ancestors: Morphic-tpr.1353

Revert change to eyedropper hotspot  On 64-bits the ColorPicker gives visibly bogus results with the 6 at 31 offset.

=============== Diff against Morphic-tpr.1353 ===============

Item was changed:
  ----- Method: ColorPickerMorph>>pickUpColorFor: (in category 'menu') -----
  pickUpColorFor: aMorph
  	"Show the eyedropper cursor, and modally track the mouse through a mouse-down and mouse-up cycle"
  
        | aHand localPt c |
  	aHand := aMorph ifNil: [self activeHand] ifNotNil: [aMorph activeHand].
  	aHand ifNil: [aHand := self currentHand].
  	self addToWorld: aHand world near: (aMorph ifNil: [aHand world]) fullBounds.
  	self owner ifNil: [^ self].
  
  	aHand showTemporaryCursor: (ScriptingSystem formAtKey: #Eyedropper) 
+ 			hotSpotOffset: 6 negated @ 4 negated.    "<<<< the form was changed a bit??"
- 			hotSpotOffset: 6 @ 31.    "<<<< the form was changed a bit??"
  
  	self updateContinuously: false.
  	[Sensor anyButtonPressed]
  		whileFalse: 
  			 [self trackColorUnderMouse].
  	self deleteAllBalloons.
  
  	localPt := Sensor cursorPoint - self topLeft.
  	self inhibitDragging ifFalse: [
  		(DragBox containsPoint: localPt) ifTrue:
  			["Click or drag the drag-dot means to anchor as a modeless picker"
  			^ self anchorAndRunModeless: aHand].
  	].
  	(clickedTranslucency := TransparentBox containsPoint: localPt)
  		ifTrue: [selectedColor := originalColor].
  
  	self updateContinuously: true.
  	[Sensor anyButtonPressed]
  		whileTrue:
  			 [self updateTargetColorWith: self indicateColorUnderMouse].
  	c := self getColorFromKedamaWorldIfPossible: Sensor cursorPoint.
  	c ifNotNil: [selectedColor := c].
  	aHand newMouseFocus: nil;
  		showTemporaryCursor: nil;
  		flushEvents.
  	self delete.
  		 
   !



More information about the Squeak-dev mailing list