[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squeak-dev
Subject:    [squeak-dev] The Trunk: Morphic-kfr.1447.mcz
From:       commits () source ! squeak ! org
Date:       2018-05-31 18:31:18
Message-ID: E1fOSMW-0003hr-Im () andreas
[Download RAW message or body]

Karl Ramberg uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-kfr.1447.mcz

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

Name: Morphic-kfr.1447
Author: kfr
Time: 31 May 2018, 8:31:01.31278 pm
UUID: 454f93ee-b4f2-4342-b84d-a9a042b803cc
Ancestors: Morphic-mt.1446

A couple of fixes for TextMorph and project loading

=============== Diff against Morphic-mt.1446 ===============

Item was changed:
  ----- Method: TextMorph>>convertToCurrentVersion:refStream: (in category 'objects \
from disk') -----  convertToCurrentVersion: varDict refStream: smartRefStrm
  	
  	self borderWidth ifNil: [
  		self borderWidth: 0.
  		self removeProperty: #fillStyle].
- 	self releaseParagraphReally.
  	^ super convertToCurrentVersion: varDict refStream: smartRefStrm.
  
  !

Item was changed:
  ----- Method: TextMorph>>fixUponLoad:seg: (in category 'objects from disk') -----
  fixUponLoad: aProject seg: anImageSegment
  	"We are in an old project that is being loaded from disk. Fix up conventions that \
have changed."  
+ 	| substituteFont |
+ 	wrapFlag ifNil:[wrapFlag := true].
- 	| substituteFont includesSubstituteFont |
  	substituteFont := aProject projectParameters at: #substitutedFont ifAbsent: \
[#none]. + 	(substituteFont ~~ #none and: [self textStyle fontArray includes: \
                substituteFont])
- 	includesSubstituteFont := false.
- 	self textStyle ifNotNil:  [includesSubstituteFont := self textStyle fontArray \
                includes: substituteFont].
- 	(substituteFont ~~ #none and: [includesSubstituteFont])
  			ifTrue: [ self fit ].
  
  	^ super fixUponLoad: aProject seg: anImageSegment!


[prev in list] [next in list] [prev in thread] [next in thread]