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

commits at source.squeak.org commits at source.squeak.org
Thu Jan 26 14:56:13 UTC 2023


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

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

Name: Morphic-mt.2079
Author: mt
Time: 26 January 2023, 3:56:10.952707 pm
UUID: 8f7b7dc9-421d-0f45-ae47-b6cc89bde14d
Ancestors: Morphic-mt.2078

Improves #uiScaleFactor support for tree widgets.

=============== Diff against Morphic-mt.2078 ===============

Item was changed:
  ----- Method: IndentingListItemMorph>>drawLineToggleToTextOn:lineColor:hasToggle: (in category 'drawing') -----
  drawLineToggleToTextOn: aCanvas lineColor: lineColor hasToggle: hasToggle
  	"If I am not the only item in my container, draw the line between:
  		- my toggle (if any) or my left edge (if no toggle)
  		- and my text left edge"
  
  	| myBounds myCenter hLineY hLineLeft |
  	self isSoleItem ifTrue: [ ^self ].
+ 	self canExpand ifTrue: [ ^self ].
  	myBounds := self toggleBounds.
  	myCenter := myBounds center.
  	hLineY := myCenter y.
+ 	hLineLeft := myCenter x.
- 	hLineLeft := myCenter x - 1.
  	"Draw line from toggle to text"
  	aCanvas
  		line: hLineLeft @ hLineY
+ 		to: myBounds right @ hLineY
+ 		width: 1 px
- 		to: myBounds right + 0 @ hLineY
- 		width: 1
  		color: lineColor!

Item was changed:
  ----- Method: IndentingListItemMorph>>drawLinesToFirstChildOn:lineColor: (in category 'drawing') -----
  drawLinesToFirstChildOn: aCanvas lineColor: lineColor 
  	"Draw line from me to next sibling"
  
  	| child vLineX vLineTop vLineBottom childBounds childCenter |
  	child := self firstVisibleChild.
  	childBounds := child toggleBounds.
  	childCenter := childBounds center.
+ 	vLineX := childCenter x.
- 	vLineX := childCenter x - 1.
  	vLineTop := bounds bottom.
+ 	vLineBottom := childCenter y.
- 	child hasToggle
- 		ifTrue: [vLineBottom := childCenter y - 7]
- 		ifFalse: [vLineBottom := childCenter y].
  	aCanvas
  		line: vLineX @ vLineTop
  		to: vLineX @ vLineBottom
+ 		width: 1 px
- 		width: 1
  		color: lineColor!

Item was changed:
  ----- Method: IndentingListItemMorph>>drawLinesToNextSiblingOn:lineColor:hasToggle: (in category 'drawing') -----
  drawLinesToNextSiblingOn: aCanvas lineColor: lineColor hasToggle: hasToggle
  	| myBounds nextSibBounds vLineX myCenter vLineTop vLineBottom |
  	myBounds := self toggleBounds.
  	nextSibBounds := self nextVisibleSibling toggleBounds.
  	myCenter := myBounds center.
+ 	vLineX := myCenter x .
- 	vLineX := myCenter x - 1.
  	vLineTop := myCenter y.
  	vLineBottom := nextSibBounds center y.
  	"Draw line from me to next sibling"
  	aCanvas
  		line: vLineX @ vLineTop
  		to: vLineX @ vLineBottom
+ 		width: 1 px
- 		width: 1
  		color: lineColor!

Item was changed:
  ----- Method: IndentingListItemMorph>>drawToggleOn:in: (in category 'drawing') -----
  drawToggleOn: aCanvas in: aRectangle
  
  	| aForm centeringOffset |
+ 	self canExpand ifFalse: [^self].
- 	complexContents hasContents ifFalse: [^self].
  	aForm := isExpanded 
  		ifTrue: [container expandedForm]
  		ifFalse: [container notExpandedForm].
+ 	centeringOffset := (aRectangle extent - aForm extent) // 2.
+ 	isExpanded ifFalse: [centeringOffset := centeringOffset + (1 px @ 0)].
- 	centeringOffset := ((aRectangle height - aForm extent y) / 2.0) rounded.
  	^aCanvas 
  		paintImage: aForm 
+ 		at: aRectangle topLeft + centeringOffset.
- 		at: (aRectangle topLeft translateBy: 0 @ centeringOffset).
  !

Item was changed:
  ----- Method: SimpleHierarchicalListMorph class>>expandedForm (in category 'instance creation') -----
  expandedForm
+ 
+ 	^ ExpandedForm ifNil: [ExpandedForm :=
+ 		ScrollBar
+ 			arrowOfDirection: #bottom
+ 			size: 11 px
+ 			color: ((self userInterfaceTheme get: #toggleColor for: #SimpleHierarchicalListMorph) ifNil: [Color gray])]!
- 	ExpandedForm
- 		ifNotNil: [ExpandedForm depth ~= Display depth
- 				ifTrue: [ExpandedForm := nil]].
- 	^ ExpandedForm
- 		ifNil: [ExpandedForm := ((Form
- 						extent: 10 @ 9
- 						depth: 8
- 						fromArray: #(4294967295 4294967295 4294901760 4294967295 4294967295 4294901760 4278255873 16843009 16842752 4294902089 1229539657 33488896 4294967041 1229539585 4294901760 4294967295 21561855 4294901760 4294967295 4278321151 4294901760 4294967295 4294967295 4294901760 4294967295 4294967295 4294901760 )
- 						offset: 0 @ 0)
- 						asFormOfDepth: Display depth)
- 							replaceColor: Color white withColor: Color transparent;
- 							scaleIconToDisplay]!

Item was changed:
  ----- Method: SimpleHierarchicalListMorph class>>notExpandedForm (in category 'instance creation') -----
  notExpandedForm
+ 
+ 	^ NotExpandedForm ifNil: [NotExpandedForm :=
+ 		ScrollBar
+ 			arrowOfDirection: #right
+ 			size: 11 px
+ 			color: ((self userInterfaceTheme get: #toggleColor for: #SimpleHierarchicalListMorph) ifNil: [Color gray])]!
- 	NotExpandedForm
- 		ifNotNil: [NotExpandedForm depth ~= Display depth
- 				ifTrue: [NotExpandedForm := nil]].
- 	^ NotExpandedForm
- 		ifNil: [NotExpandedForm := ((Form
- 						extent: 10 @ 9
- 						depth: 8
- 						fromArray: #(4294967041 4294967295 4294901760 4294967041 33554431 4294901760 4294967041 1224867839 4294901760 4294967041 1229521407 4294901760 4294967041 1229539585 4294901760 4294967041 1229521407 4294901760 4294967041 1224867839 4294901760 4294967041 33554431 4294901760 4294967041 4294967295 4294901760 )
- 						offset: 0 @ 0)
- 							asFormOfDepth: Display depth)
- 								replaceColor: Color white withColor: Color transparent;
- 								scaleIconToDisplay]!



More information about the Squeak-dev mailing list