[squeak-dev] The Trunk: Morphic-laza.363.mcz

commits at source.squeak.org commits at source.squeak.org
Fri Feb 26 21:19:04 UTC 2010


Alexander Lazarević uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-laza.363.mcz

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

Name: Morphic-laza.363
Author: laza
Time: 26 February 2010, 10:17:53.473 pm
UUID: cb0a689c-807b-064a-9e0d-f6e7f124796f
Ancestors: Morphic-laza.362

The full screen entry of the window menu did not preserve the original window dimensions. Now the menu entry mimics the expand/contact button and reads either full screen or original size

=============== Diff against Morphic-laza.362 ===============

Item was changed:
  ----- Method: SystemWindow>>buildWindowMenu (in category 'menu') -----
  buildWindowMenu
  	| aMenu |
  	aMenu := MenuMorph new defaultTarget: self.
  	aMenu add: 'change title...' translated action: #relabel.
  	aMenu addLine.
  	aMenu add: 'send to back' translated action: #sendToBack.
  	aMenu add: 'make next-to-topmost' translated action: #makeSecondTopmost.
  	aMenu addLine.
  	self mustNotClose
  		ifFalse:
  			[aMenu add: 'make unclosable' translated action: #makeUnclosable]
  		ifTrue:
  			[aMenu add: 'make closable' translated action: #makeClosable].
  	aMenu
  		add: (self isSticky ifTrue: ['make draggable'] ifFalse: ['make undraggable']) translated 
  		action: #toggleStickiness.
  	aMenu addLine.
+ 	self unexpandedFrame 
+ 		ifNil: [aMenu add: 'full screen' translated action: #expandBoxHit]
+ 		ifNotNil: [aMenu add: 'original size' translated action: #expandBoxHit].
- 	aMenu add: 'full screen' translated action: #fullScreen.
  	self isCollapsed ifFalse: [aMenu add: 'window color...' translated action: #setWindowColor].
  	^aMenu!

Item was changed:
  ----- Method: SystemWindow>>expandBoxHit (in category 'resize/collapse') -----
  expandBoxHit
- 	"The full screen expand box has been hit"
- 
  	isCollapsed
+ 		ifTrue: [self	hide;
+ 					collapseOrExpand;
+ 					expandToFullScreen;
+ 					show]
+ 		ifFalse: [self unexpandedFrame 
+ 					ifNil: [self expandToFullScreen]
+ 					ifNotNil: [self contractToOriginalSize]]!
- 		ifTrue: [self hide.
- 			self collapseOrExpand.
- 			self unexpandedFrame ifNil: [ self unexpandedFrame: fullFrame. ].
- 			self fullScreen.
- 			expandBox setBalloonText: 'contract to original size' translated.
- 			^ self show].
- 	self unexpandedFrame
- 		ifNil: [self unexpandedFrame: fullFrame.
- 			self fullScreen.
- 			expandBox setBalloonText: 'contract to original size' translated]
- 		ifNotNil: [self bounds: self unexpandedFrame.
- 			self unexpandedFrame: nil.
- 			expandBox setBalloonText: 'expand to full screen' translated]!

Item was added:
+ ----- Method: SystemWindow>>expandToFullScreen (in category 'resize/collapse') -----
+ expandToFullScreen
+ 	self unexpandedFrame ifNil: [ self unexpandedFrame: fullFrame ].
+ 	self fullScreen.
+ 	expandBox setBalloonText: 'contract to original size' translated!

Item was added:
+ ----- Method: SystemWindow>>contractToOriginalSize (in category 'resize/collapse') -----
+ contractToOriginalSize
+ 	self bounds: self unexpandedFrame.
+ 	self unexpandedFrame: nil.
+ 	^ expandBox setBalloonText: 'expand to full screen' translated!




More information about the Squeak-dev mailing list