[squeak-dev] The Trunk: Morphic-mt.1262.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Aug 11 18:05:17 UTC 2016


Marcel Taeumel uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-mt.1262.mcz

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

Name: Morphic-mt.1262
Author: mt
Time: 11 August 2016, 8:04:36.657369 pm
UUID: 47dfbbe5-ccaa-f544-8048-7735ac5cf66d
Ancestors: Morphic-mt.1261

Fixes minor hick-ups with overriding the desktop color and respecting this when changing themes.

=============== Diff against Morphic-mt.1261 ===============

Item was changed:
  ----- Method: MorphicProject>>setAsBackground: (in category 'utilities') -----
+ setAsBackground: aFormOrColorOrFillStyle
- setAsBackground: aForm
  	"Set  aForm as a background image."
  
+ 	| thisWorld newFill oldFill |
- 	| thisWorld newColor |
  	thisWorld := self currentWorld.
+ 	
+ 	oldFill := thisWorld fillStyle.
+ 	thisWorld fillStyle: aFormOrColorOrFillStyle.
+ 	newFill := thisWorld fillStyle.
+ 	
+ 	newFill rememberCommand:
- 	newColor := InfiniteForm with: aForm.
- 	aForm rememberCommand:
  		(Command new cmdWording: 'set background to a picture' translated;
+ 			undoTarget: thisWorld selector: #fillStyle: argument: oldFill;
+ 			redoTarget: thisWorld selector: #fillStyle: argument: newFill).
+ 	
- 			undoTarget: thisWorld selector: #color: argument: thisWorld color;
- 			redoTarget: thisWorld selector: #color: argument: newColor).
- 	thisWorld color: newColor.
  	thisWorld setProperty: #hasCustomBackground toValue: true.
  !

Item was added:
+ ----- Method: PasteUpMorph>>fillStyle: (in category 'visual properties') -----
+ fillStyle: aFormOrColorOrFillStyle
+ 
+ 	^ super fillStyle: (aFormOrColorOrFillStyle isForm
+ 		ifTrue: [InfiniteForm with: aFormOrColorOrFillStyle]
+ 		ifFalse: [aFormOrColorOrFillStyle isColor
+ 			ifTrue: [SolidFillStyle color: aFormOrColorOrFillStyle]
+ 			ifFalse: [aFormOrColorOrFillStyle]])!

Item was changed:
  ----- Method: PasteUpMorph>>gradientFillColor: (in category 'display') -----
  gradientFillColor: aColor
  	"For backwards compatibility with GradientFillMorph"
  
  	self flag: #fixThis.
  	self useGradientFill.
  	self fillStyle colorRamp: {0.0 -> self fillStyle colorRamp first value. 1.0 -> aColor}.
+ 	self setAsBackground: self fillStyle.
  	self changed!

Item was added:
+ ----- Method: PasteUpMorph>>setAsBackground: (in category 'visual properties') -----
+ setAsBackground: aFormOrColorOrFillStyle
+ 
+ 	(self outermostWorldMorph == self and: [Project current isMorphic])
+ 		ifTrue: [Project current setAsBackground: aFormOrColorOrFillStyle]
+ 		ifFalse: [self fillStyle: aFormOrColorOrFillStyle].!

Item was changed:
  ----- Method: TheWorldMenu>>changeBackgroundColor (in category 'commands') -----
  changeBackgroundColor
  	"Let the user select a new background color for the world"
  	myWorld
  		changeColorTarget: myWorld
+ 		selector: #setAsBackground:
+ 		originalColor: myWorld fillStyle asColor
- 		selector: #color:
- 		originalColor: myWorld color asColor
  		hand: myWorld activeHand!



More information about the Squeak-dev mailing list