[squeak-dev] The Trunk: System-mt.1338.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Apr 7 12:20:23 UTC 2022


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

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

Name: System-mt.1338
Author: mt
Time: 7 April 2022, 2:20:19.555346 pm
UUID: 3084fe68-b3fc-2c4c-a9fc-7d11080b740e
Ancestors: System-ct.1337

Fixes the issue where switching from a PPI-backed scale factor to a "faked" scale factor did not have the correct PPI set to 96.0 while already updating Morphic contents.

Complements Morphic-mt.1965.

=============== Diff against System-ct.1337 ===============

Item was changed:
  ----- Method: UserInterfaceTheme>>doScale075 (in category 'private - display scale') -----
  doScale075
  	"Private. Use #applyScaled:. This is actually about 71% because of which font sizes we have available."
  	
  	self flag: #hack. "mt: A different scale factor should not result in different point sizes being selected BUT the same point size resulting in a different pixel height."
  	
  	self setFonts: #(
  		standardSystemFont 7.5
  		standardFixedFont (Accumon 8.5)
  
  		standardCodeFont 7.5
  		standardListFont 7.5
  		standardButtonFont 7.5
  		standardMenuFont 7.5
  		standardFlapFont 7.5
  			
  		windowTitleFont 7.5
  		balloonHelpFont 7.5
  		haloLabelFont 7.5
  		
  		wizardStandardFont 10.5
  		wizardButtonFont 10.5
  		wizardHelpFont 7.5
  		wizardTitleFont 16.5) forceTTC: false.
  
+ 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."
+ 	self apply.!
- 	self apply.
- 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."!

Item was changed:
  ----- Method: UserInterfaceTheme>>doScale100 (in category 'private - display scale') -----
  doScale100
  	"Private. Use #applyScaled:. The reference theme, which has a 100% scale factor, must already be there. Look it up and apply it."
  	
+ 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."
+ 	self checkTheme100 apply.!
- 	self checkTheme100 apply.
- 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."!

Item was changed:
  ----- Method: UserInterfaceTheme>>doScale125 (in category 'private - display scale') -----
  doScale125
  	"Private. Use #applyScaled:. This is actually about 135% because of which font sizes we have available."
  	
  	self flag: #hack. "mt: A different scale factor should not result in different point sizes being selected BUT the same point size resulting in a different pixel height."
  	
  	self setFonts: #(
  		standardSystemFont 14.5
  		standardFixedFont 14.5
  
  		standardCodeFont 14.5
  		standardListFont 14.5
  		standardButtonFont 10.5
  		standardMenuFont 14.5
  		standardFlapFont 10.5
  			
  		windowTitleFont 14.5
  		balloonHelpFont 10.5
  		haloLabelFont 14.5
  		
  		wizardStandardFont 20.0
  		wizardButtonFont 20.0
  		wizardHelpFont 14.5
  		wizardTitleFont 32.5) forceTTC: false.
  
+ 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."
+ 	self apply.!
- 	self apply.
- 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."!

Item was changed:
  ----- Method: UserInterfaceTheme>>doScale150 (in category 'private - display scale') -----
  doScale150
  	"Private. Use #applyScaled:. Traditional 'Demo Mode'. Optimized for existing pre-rendered fonts. Does not fall back on TTC font. See #doScale:. This is actually about 157% because of which font sizes we have available."
  	
  	self flag: #hack. "mt: A different scale factor should not result in different point sizes being selected BUT the same point size resulting in a different pixel height."
  	
  	self setFonts: #(
  		standardSystemFont 16.5
  		standardFixedFont 16.5
  
  		standardCodeFont 16.5
  		standardListFont 16.5
  		standardButtonFont 14.5
  		standardMenuFont 16.5
  		standardFlapFont 14.5
  			
  		windowTitleFont 16.5
  		balloonHelpFont 14.5
  		haloLabelFont 16.5
  		
  		wizardStandardFont 22.5
  		wizardButtonFont 22.5
  		wizardHelpFont 16.5
  		wizardTitleFont 36.5) forceTTC: false.
  
+ 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."
+ 	self apply.!
- 	self apply.
- 	TextStyle pixelsPerInch: 96.0. "Restore Squeak's default PPI for 100%."!

Item was changed:
  ----- Method: UserInterfaceTheme>>scaleMorphicToolsBy: (in category 'private - fonts') -----
  scaleMorphicToolsBy: factor
  
  	(factor closeTo: 1) ifTrue: [^ self].
  	
  	(Project respondsTo: #allMorphicProjects) ifTrue: [
  		Project allMorphicProjects do: [:ea |
  			ea world submorphs
+ 				select: [:morph | morph handlesDisplayScaleChangedBy: factor]
- 				select: [:morph | morph isSystemWindow]
  				thenDo: [:window | window displayScaleChangedBy: factor] ]].!



More information about the Squeak-dev mailing list