[squeak-dev] The Trunk: MorphicExtras-cmm.97.mcz

commits at source.squeak.org commits at source.squeak.org
Thu Dec 9 22:32:40 UTC 2010


Chris Muller uploaded a new version of MorphicExtras to project The Trunk:
http://source.squeak.org/trunk/MorphicExtras-cmm.97.mcz

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

Name: MorphicExtras-cmm.97
Author: cmm
Time: 9 December 2010, 4:32:15.746 pm
UUID: eab66c63-0712-4bbd-ad8c-e91cc4efc75d
Ancestors: MorphicExtras-ul.96

- When viewing a BookMorph in full-screen mode, don't show the docking bar, and center the navigation controls at the bottom of the screen.
- Honor the new color-picker preference when setting color of BookMorph pages.

=============== Diff against MorphicExtras-ul.96 ===============

Item was changed:
  ----- Method: BookMorph>>exitFullScreen (in category 'other') -----
  exitFullScreen
- 
  	| floater |
+ 	self isInFullScreenMode ifFalse: [ ^ self ].
+ 	self
+ 		setProperty: #fullScreenMode
+ 		toValue: false.
+ 	(self hasProperty: #showWorldMainDockingBarWhenNotFullScreen) ifTrue:
+ 		[ MorphicProject current showWorldMainDockingBar: (self valueOfProperty: #showWorldMainDockingBarWhenNotFullScreen).
+ 		self removeProperty: #showWorldMainDockingBarWhenNotFullScreen ].
+ 	floater := self
+ 		valueOfProperty: #floatingPageControls
+ 		ifAbsent: [  ].
+ 	floater ifNotNil:
+ 		[ floater delete.
+ 		self removeProperty: #floatingPageControls ].
+ 	self position: 0 @ 0.
+ 	self adjustCurrentPageForFullScreen!
- 
- 	self isInFullScreenMode ifFalse: [^self].
- 	self setProperty: #fullScreenMode toValue: false.
- 	floater := self valueOfProperty: #floatingPageControls ifAbsent: [nil].
- 	floater ifNotNil: [
- 		floater delete.
- 		self removeProperty: #floatingPageControls.
- 	].
- 	self position: 0 at 0.
- 	self adjustCurrentPageForFullScreen.
- !

Item was changed:
  ----- Method: BookMorph>>goFullScreen (in category 'other') -----
  goFullScreen
- 
  	| floater |
+ 	self isInFullScreenMode ifTrue: [ ^ self ].
+ 	self
+ 		setProperty: #fullScreenMode
+ 		toValue: true.
+ 	self
+ 		setProperty: #showWorldMainDockingBarWhenNotFullScreen
+ 		toValue: Project current showWorldMainDockingBar.
+ 	Project current showWorldMainDockingBar: false.
- 
- 	self isInFullScreenMode ifTrue: [^self].
- 	self setProperty: #fullScreenMode toValue: true.
  	self position: (currentPage topLeft - self topLeft) negated.
  	self adjustCurrentPageForFullScreen.
  	floater := self buildFloatingPageControls.
+ 	self
+ 		setProperty: #floatingPageControls
+ 		toValue: floater.
+ 	floater openInWorld!
- 	self setProperty: #floatingPageControls toValue: floater.
- 	floater openInWorld.
- !

Item was changed:
  ----- Method: BookMorph>>setPageColor (in category 'menu') -----
  setPageColor
  	"Get a color from the user, then set all the pages to that color"
+ 	self currentPage ifNil: [ ^ self ].
+ 	NewColorPickerMorph useIt
+ 		ifTrue:
+ 			[ (NewColorPickerMorph
+ 				on: self
+ 				originalColor: self currentPage color
+ 				setColorSelector: #setAllPagesColor:) openNear: self fullBoundsInWorld ]
+ 		ifFalse:
+ 			[ ColorPickerMorph new
+ 				 choseModalityFromPreference ;
+ 				 sourceHand: self activeHand ;
+ 				 target: self ;
+ 				 selector: #setAllPagesColor: ;
+ 				 originalColor: self currentPage color ;
+ 				
+ 				putUpFor: self
+ 				near: self fullBoundsInWorld ]!
- 
- 	self currentPage ifNil: [^ self].
- 	ColorPickerMorph new
- 		choseModalityFromPreference;
- 		sourceHand: self activeHand;
- 		target: self;
- 		selector: #setAllPagesColor:;
- 		originalColor: self currentPage color;
- 		putUpFor: self near: self fullBoundsInWorld!

Item was changed:
  ----- Method: FloatingBookControlsMorph>>step (in category 'stepping and presenter') -----
  step
  
  	owner == self world ifFalse: [^ self].
  	owner addMorphInLayer: self.
+ 	self position: (owner bottomCenter) - ((self width//2)@self height)
  !




More information about the Squeak-dev mailing list