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

commits at source.squeak.org commits at source.squeak.org
Mon Feb 17 15:18:46 UTC 2020


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

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

Name: Morphic-mt.1624
Author: mt
Time: 17 February 2020, 4:18:38.814347 pm
UUID: 9aec0d72-c81c-6041-9bd4-8c1826a49d65
Ancestors: Morphic-mt.1623

Fixes three (hi-dpi / demo mode) scaling issues:
(1) selected icon in docking bars
(2) box replacement in windows (thanks to Christoph (ct)!)
(3) full-screen icon in world main docking bar.

=============== Diff against Morphic-mt.1623 ===============

Item was changed:
  ----- Method: DockingBarItemMorph>>selectedIcon: (in category 'accessing') -----
+ selectedIcon: aFormOrNil
- selectedIcon: aForm
  
+ 	selectedIcon := aFormOrNil
+ 		ifNotNil: [:form | form scaleIconToDisplay].!
- 	selectedIcon := aForm!

Item was changed:
  ----- Method: SystemWindow>>applyUserInterfaceTheme (in category 'user interface') -----
  applyUserInterfaceTheme
  
  	super applyUserInterfaceTheme.
  	
  	self
  		setDefaultParameters;
+ 		replaceBoxes;
  		refreshWindowColor.
  
  	self isLookingFocused
  		ifTrue: [self lookUnfocused; lookFocused]
  		ifFalse: [self lookFocused; lookUnfocused].
  		
  	self isCollapsed ifTrue: [self setProperty: #applyTheme toValue: true].!

Item was changed:
  ----- Method: TheWorldMainDockingBar>>toggleFullScreenOn: (in category 'right side') -----
  toggleFullScreenOn: aDockingBar 
  	
  	| toggleMorph onIcon offIcon box bgColor |
+ 	offIcon := (MenuIcons fullscreenWireframeIcon dyed:
+ 					(self userInterfaceTheme logoColor ifNil: [Color black])) scaleIconToDisplay.
+ 	onIcon := (MenuIcons fullscreenWireframeIcon dyed:
+ 					(self userInterfaceTheme selectionLogoColor ifNil: [Color white])) scaleIconToDisplay.
- 	offIcon := MenuIcons fullscreenWireframeIcon dyed:
- 					(self userInterfaceTheme logoColor ifNil: [Color black]).
- 	onIcon := MenuIcons fullscreenWireframeIcon dyed:
- 					(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!



More information about the Squeak-dev mailing list