[squeak-dev] The Trunk: Nebraska-mt.53.mcz

commits at source.squeak.org commits at source.squeak.org
Sun May 6 13:17:08 UTC 2018


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

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

Name: Nebraska-mt.53
Author: mt
Time: 6 May 2018, 3:16:38.375836 pm
UUID: bef0ab6e-41e7-b340-a9e7-719d3a60c412
Ancestors: Nebraska-ul.52

Supplement to refactoring in Morphic-mt.1427.

=============== Diff against Nebraska-ul.52 ===============

Item was changed:
  ----- Method: NebraskaCommunicatorMorph>>addGateKeeperMorphs (in category 'collaborative') -----
  addGateKeeperMorphs
  
  	| list currentTime choices |
  
  	self setProperty: #gateKeeperCounterValue toValue: NebraskaGateKeeperMorph updateCounter.
  	choices := #(
  		(60 'm' 'in the last minute')
  		(3600 'h' 'in the last hour')
  		(86400 'd' 'in the last day')
  	).
  	currentTime := Time totalSeconds.
  	list := NebraskaGateKeeperMorph knownIPAddresses.
  	list do: [ :each | | age row |
  		age := each timeBetweenLastAccessAnd: currentTime.
  		age := choices
  			detect: [ :x | age <= x first]
  			ifNone: [{0. '-'. (age // 86400) printString,'days ago'}].
  		row := self addARow:
  		(NebraskaIncomingMessage allTypes collect: [ :type |
  				self toggleButtonFor: each attribute: type]
  		),
  		{
  
  			(self inAColumn: {
  				(StringMorph contents: age second) lock.
  			}) layoutInset: 2; hResizing: #shrinkWrap; setBalloonText: 'Last attempt was ',age third.
  
  			(self inAColumn: {
  				(StringMorph contents: each ipAddress) lock.
  			}) layoutInset: 2; hResizing: #shrinkWrap.
  
  			(self inAColumn: {
  				(StringMorph contents: each latestUserName) lock.
  			}) layoutInset: 2.
  		}.
  		row
  			color: (Color r: 0.6 g: 0.8 b: 1.0);
+ 			borderStyle: (BorderStyle raised width: 1);
- 			borderWidth: 1;
- 			borderColor: #raised;
  			vResizing: #spaceFill;
  			"on: #mouseUp send: #mouseUp:in: to: self;"
  			setBalloonText: each fullInfoString
  	].!

Item was changed:
  ----- Method: NebraskaFridgeMorph>>defaultBorderColor (in category 'initialization') -----
  defaultBorderColor
+ 	^ Color transparent!
- 	"answer the default border color/fill style for the receiver"
- 	^ #raised!

Item was added:
+ ----- Method: NebraskaFridgeMorph>>defaultBorderStyle (in category 'initialization') -----
+ defaultBorderStyle
+ 	^ BorderStyle raised!

Item was changed:
  ----- Method: NebraskaFridgeMorph>>rebuild (in category 'as yet unclassified') -----
  rebuild
  
  	| row filler fudge people maxPerRow insetY |
  
  	updateCounter := self class updateCounter.
  	self removeAllMorphs.
  	(self addARow: {
  		filler := Morph new color: Color transparent; extent: 4 at 4.
  	}) vResizing: #shrinkWrap.
  	self addARow: {
  		(StringMorph contents: 'the Fridge' translated) lock.
  		self groupToggleButton.
  	}.
  	row := self addARow: {}.
  	people := self class fridgeRecipients.
  	maxPerRow := people size < 7 ifTrue: [2] ifFalse: [3].	
  		"how big can this get before we need a different approach?"
  	people do: [ :each |
  		row submorphCount >= maxPerRow ifTrue: [row := self addARow: {}].
  		row addMorphBack: (
  			groupMode ifTrue: [
  				(each userPicture scaledToSize: 35 at 35) asMorph lock
  			] ifFalse: [
  				each veryDeepCopy killExistingChat
  			]
  		)
  	].
  	fullBounds := nil.
  	self fullBounds.
  	"htsBefore := submorphs collect: [ :each | each height]."
  
  	fudge := 20.
  	insetY := self layoutInset.
  	insetY isPoint ifTrue: [insetY := insetY y].
  	filler extent: 
+ 		4 @ (self height - filler height * 0.37 - insetY - self borderWidth - fudge) truncated.
- 		4 @ (self height - filler height * 0.37 - insetY - borderWidth - fudge) truncated.
  
  	"self fixLayout.
  	htsAfter := submorphs collect: [ :each | each height].
  	{htsBefore. htsAfter} explore."
  
  !

Item was changed:
  ----- Method: NebraskaGateKeeperMorph>>defaultBorderColor (in category 'initialization') -----
  defaultBorderColor
+ 	^ Color transparent!
- 	"answer the default border color/fill style for the receiver"
- 	^ #raised!

Item was added:
+ ----- Method: NebraskaGateKeeperMorph>>defaultBorderStyle (in category 'initialization') -----
+ defaultBorderStyle
+ 	^ BorderStyle raised!

Item was changed:
  ----- Method: NebraskaServerMorph>>setColorsAndBorder (in category 'initialization') -----
  setColorsAndBorder
  	| worldColor c |
  	c := ((Preferences menuColorFromWorld and: [Display depth > 4]) 
  				and: [(worldColor := self currentWorld color) isColor]) 
  					ifTrue: 
  						[worldColor luminance > 0.7 
  							ifTrue: [worldColor mixed: 0.8 with: Color black]
  							ifFalse: [worldColor mixed: 0.4 with: Color white]]
  					ifFalse: [Color r: 0.9 g: 0.9 b: 0.9]. 
  	self color: c.
+ 	self borderStyle: (BorderStyle raised width: 1).
- 	self borderColor: #raised.
- 	self borderWidth: 1.
  	self useRoundedCorners!



More information about the Squeak-dev mailing list