[squeak-dev] The Trunk: Morphic-ct.2028.mcz

commits at source.squeak.org commits at source.squeak.org
Tue Aug 23 11:15:01 UTC 2022


Christoph Thiede uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-ct.2028.mcz

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

Name: Morphic-ct.2028
Author: ct
Time: 23 August 2022, 1:14:55.320308 pm
UUID: e4fc5959-8c38-f04e-a993-2315a0f6c00c
Ancestors: Morphic-ct.2027, Morphic-ct.1687

Merges Morphic-ct.1687:
	Fixes SystemWindow >> #collapseOrExpand if the window being collapsed is not in world.

=============== Diff against Morphic-ct.2027 ===============

Item was changed:
  ----- Method: SystemWindow>>collapseOrExpand (in category 'resize/collapse') -----
  collapseOrExpand
  	"Collapse or expand the window, depending on existing state"
  	| cf |
  	isCollapsed
  		ifTrue: 
  			["Expand -- restore panes to morphics structure"
  			isCollapsed := false.
  			self beKeyWindow.  "Bring to frint first"
  			Preferences collapseWindowsInPlace
  				ifTrue: 
  					[fullFrame := fullFrame align: fullFrame topLeft with: self getBoundsWithFlex topLeft]
  				ifFalse:
  					[collapsedFrame := self getBoundsWithFlex].
  			collapseBox ifNotNil: [collapseBox setBalloonText: 'collapse this window' translated].
  			self setBoundsWithFlex: fullFrame.
  			paneMorphs reverseDo: 
  					[:m |  self addMorph: m unlock.
  					self world startSteppingSubmorphsOf: m].
  			self addPaneSplitters.
- 			self addGrips.
  			(self hasProperty: #applyTheme) ifTrue: [
  				self removeProperty: #applyTheme.
  				self userInterfaceTheme applyTo: self allMorphs]]
  		ifFalse: 
  			["Collapse -- remove panes from morphics structure"
  			isCollapsed := true.
  			fullFrame := self getBoundsWithFlex.
  			"First save latest fullFrame"
  			paneMorphs do: [:m | m delete; releaseCachedState].
  			self removePaneSplitters.
+ 			self removeCornerGrips.
- 			self removeGrips.
  			model modelSleep.
  			cf := self getCollapsedFrame.
  			(collapsedFrame isNil and: [Preferences collapseWindowsInPlace not]) ifTrue:
  				[collapsedFrame := cf].
  			self setBoundsWithFlex: cf.
  			collapseBox ifNotNil: [collapseBox setBalloonText: 'expand this window' translated ].
  			expandBox ifNotNil: [expandBox setBalloonText: 'expand this window' translated ].
+ 			self isInWorld ifTrue: [self sendToBack]].
+ 	self layoutChanged.!
- 			self sendToBack].
- 	self layoutChanged!



More information about the Squeak-dev mailing list