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

commits at source.squeak.org commits at source.squeak.org
Thu Jul 21 09:16:45 UTC 2016


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

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

Name: Morphic-mt.1194
Author: mt
Time: 21 July 2016, 11:16:04.356126 am
UUID: 651c8cbd-ca2b-d247-95e2-b9d53eae175b
Ancestors: Morphic-pre.1193

Fixes a small bug in layout computation of buttons.

=============== Diff against Morphic-pre.1193 ===============

Item was changed:
  ----- Method: PluggableButtonMorph>>updateMinimumExtent (in category 'layout') -----
  updateMinimumExtent
  
  	| hMin vMin |
  	self label isMorph
  		ifTrue: [^ self minimumExtent: self label minExtent].
  
  	hMin := vMin := 0.
+ 	self hResizing ~~ #spaceFill
- 	self hResizing == #shrinkWrap
  		ifTrue: [hMin := (self font widthOfString: self label)].
+ 	self vResizing ~~ #spaceFill
- 	self vResizing == #shrinkWrap
  		ifTrue: [vMin := self font height].
  
  	hMin := hMin + (2* self borderStyle width).
  	vMin := vMin + (2* self borderStyle width).
  			
  	self layoutInset isRectangle
  		ifTrue: [
  			hMin := hMin + self layoutInset left + self layoutInset right.
  			vMin := vMin + self layoutInset top + self layoutInset bottom]
  		ifFalse: [self layoutInset isPoint
  			ifTrue: [
  				hMin := hMin + (2* self layoutInset x).
  				vMin := vMin + (2* self layoutInset y)]
  			ifFalse: [
  				hMin := hMin + (2* self layoutInset).
  				vMin := vMin + (2* self layoutInset)]].
  	
  	self minimumExtent: hMin @ vMin.
  
  	"Since we have no submorphs, we have to resize here if we want to shrink wrap."
  	self hResizing == #shrinkWrap ifTrue: [self width: hMin].
  	self vResizing == #shrinkWrap ifTrue: [self height: vMin].!



More information about the Squeak-dev mailing list