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

commits at source.squeak.org commits at source.squeak.org
Thu Mar 29 12:34:22 UTC 2018


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

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

Name: Morphic-mt.1405
Author: mt
Time: 29 March 2018, 2:34:02.381957 pm
UUID: afa48519-1b10-634d-8ffc-40ae0f4db608
Ancestors: Morphic-mt.1404

Make use of new #dyed: message in forms to dye forms.

=============== Diff against Morphic-mt.1404 ===============

Item was changed:
  ----- Method: MenuItemMorph class>>defaultSubMenuMarker (in category 'defaults') -----
  defaultSubMenuMarker
  
+ 	^ MenuIcons subMenuMarker dyed: ((UserInterfaceTheme current get: #textColor for: self) ifNil: [Color black]).!
- 	^ MenuIcons subMenuMarkerColorized: ((UserInterfaceTheme current get: #textColor for: self) ifNil: [Color black]).!

Item was changed:
  ----- Method: MenuItemMorph>>offImage (in category 'private') -----
  offImage
  	"Return the form to be used for indicating an '<off>' marker"
  	
+ 	^ MenuIcons checkBoxOff dyed: (self userInterfaceTheme textColor ifNil: [Color black])!
- 	^ MenuIcons checkBoxOffColorized: (self userInterfaceTheme textColor ifNil: [Color black])!

Item was changed:
  ----- Method: MenuItemMorph>>onImage (in category 'private') -----
  onImage
  	"Return the form to be used for indicating an '<on>' marker"
  
+ 	^ MenuIcons checkBoxOn dyed: (self userInterfaceTheme textColor ifNil: [Color black])!
- 	^ MenuIcons checkBoxOnColorized: (self userInterfaceTheme textColor ifNil: [Color black])!

Item was changed:
  ----- Method: TheWorldMainDockingBar>>squeakMenuOn: (in category 'construction') -----
  squeakMenuOn: aDockingBar 
  	"Private - fill the given docking bar"
  	
  	aDockingBar addItem: [ :item |
  		item
  			contents: '';
+ 			icon: (MenuIcons squeakLogoIcon dyed:
- 			icon: (MenuIcons squeakLogoIconColorized:
  				(self userInterfaceTheme logoColor ifNil: [Color black]));
+ 			selectedIcon: (MenuIcons squeakLogoIcon dyed:
- 			selectedIcon: (MenuIcons squeakLogoIconColorized:
  				(self userInterfaceTheme selectionLogoColor ifNil: [Color white]));
  			addSubMenu: [ :menu | 
  				self
  					aboutMenuItemOn: menu;
  					updateMenuItemOn: menu.
  				menu addLine.
  				self 
  					saveMenuItemOn: menu;
  					saveAsMenuItemOn: menu;
  					saveAsNewVersionMenuItemOn: menu.
  				menu addLine.
  				self
  					saveAndQuitMenuItemOn: menu;
  					quitMenuItemOn: menu ] ]!

Item was changed:
  ----- Method: TheWorldMainDockingBar>>toggleFullScreenOn: (in category 'right side') -----
  toggleFullScreenOn: aDockingBar 
  	
  	| toggleMorph onIcon offIcon box bgColor |
+ 	offIcon := MenuIcons fullscreenWireframeIcon dyed:
- 	offIcon := MenuIcons fullscreenWireframeIconColorized:
  					(self userInterfaceTheme logoColor ifNil: [Color black]).
+ 	onIcon := MenuIcons fullscreenWireframeIcon dyed:
- 	onIcon := MenuIcons fullscreenWireframeIconColorized:
  					(self userInterfaceTheme selectionLogoColor ifNil: [Color white]).
  	bgColor := (UserInterfaceTheme current get: #selectionColor for: #DockingBarItemMorph) ifNil: [Color blue].
  	
  	toggleMorph := offIcon asMorph.
  	
  	box := Morph new
  		color: Color transparent;
  		hResizing: #shrinkWrap;
  		vResizing: #spaceFill;
  		listCentering: #center;
  		width: toggleMorph width;
  		changeTableLayout;
  		
  		borderWidth: 1;
  		borderColor: Color transparent;
  		balloonText: 'toggle full screen mode' translated;
  		addMorph: toggleMorph.
  		
  	toggleMorph setToAdhereToEdge: #rightCenter. 
  		
  	box
  		on: #mouseUp
  		send: #value
  		to:
  			[ DisplayScreen toggleFullScreen. 
  			"toggleMorph image: MenuIcons smallFullscreenOffIcon" ] ;
  
  		on: #mouseEnter
  		send: #value
  		to: [
  			toggleMorph image: onIcon.
  			box color: bgColor; borderColor: bgColor];
  		
  		on: #mouseLeave
  		send: #value
  		to: [
  			toggleMorph image: offIcon.
  			box color: Color transparent; borderColor: Color transparent].
  				
  	aDockingBar addMorphBack: box!

Item was changed:
  ----- Method: ThreePhaseButtonMorph class>>checkBox (in category 'instance creation') -----
  checkBox
  	"Answer a button pre-initialized with checkbox images."
  	| f |
  	^self new
+ 		onImage: (f := MenuIcons checkBoxOn dyed: Color red);
+ 		pressedImage: (MenuIcons checkBoxPressed dyed: Color black);
+ 		offImage: (MenuIcons checkBoxOff dyed: Color black);
- 		onImage: (f := MenuIcons checkBoxOnColorized: Color red);
- 		pressedImage: (MenuIcons checkBoxPressedColorized: Color black);
- 		offImage: (MenuIcons checkBoxOffColorized: Color black);
  		extent: f extent + (2 at 0);
  		setDefaultParameters;
  		yourself
  !

Item was changed:
  ----- Method: ThreePhaseButtonMorph class>>radioButton (in category 'instance creation') -----
  radioButton
  	"Answer a button pre-initialized with radiobutton images."
  	| f |
  	^self new
+ 		onImage: (f := MenuIcons radioButtonOn dyed: Color black);
+ 		pressedImage: (MenuIcons radioButtonPressed dyed: Color black);
+ 		offImage: (MenuIcons radioButtonOff dyed: Color black);
- 		onImage: (f := MenuIcons radioButtonOnColorized: Color black);
- 		pressedImage: (MenuIcons radioButtonPressedColorized: Color black);
- 		offImage: (MenuIcons radioButtonOffColorized: Color black);
  		extent: f extent + (2 at 0);
  		setDefaultParameters;
  		yourself
  !



More information about the Squeak-dev mailing list