[squeak-dev] The Trunk: MorphicExtras-mt.184.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Aug 24 08:54:04 UTC 2016


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

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

Name: MorphicExtras-mt.184
Author: mt
Time: 24 August 2016, 10:53:41.897003 am
UUID: 79677d6b-d106-2443-aa77-d7440477a793
Ancestors: MorphicExtras-mt.183

Remove use of ColorTheme.

=============== Diff against MorphicExtras-mt.183 ===============

Item was changed:
  ----- Method: AlignmentMorphBob1>>fancyText:font:color: (in category 'as yet unclassified') -----
  fancyText: aString font: aFont color: aColor 
  	| answer tm col |
+ 	col := Preferences menuAppearance3d
- 	col := ColorTheme current dialog3DTitles
  				ifTrue: [aColor]
  				ifFalse: [aColor negated].
  	tm := TextMorph new.
  	tm beAllFont: aFont;
  		 color: col;
  		 contents: aString.
  	answer := self inAColumn: {tm}.
+ 	Preferences menuAppearance3d
- 	ColorTheme current dialog3DTitles
  		ifTrue: [""
  			tm addDropShadow.
  			tm shadowPoint: 5 @ 5 + tm bounds center].
  	tm lock.
  	^ answer!

Item was changed:
  ----- Method: GeePrinterDialogMorph>>cancelButton (in category 'as yet unclassified') -----
  cancelButton
  	^ self
  		buttonNamed: 'Cancel'
  		action: #doCancel
+ 		color: Color lightRed
- 		color: ColorTheme current cancelColor
  		help: 'Cancel this printing operation.'!

Item was changed:
  ----- Method: Morph>>dismissButton (in category '*MorphicExtras-menus') -----
  dismissButton
  	"Answer a button whose action would be to dismiss the receiver, and whose action is to send #delete to the receiver"
  
  	| aButton |
  	aButton := SimpleButtonMorph new.
  	aButton
  		target: self topRendererOrSelf;
+ 		color: Color lightRed;
+ 		borderColor: Color lightRed muchDarker;
- 		color: ColorTheme current cancelColor;
- 		borderColor: ColorTheme current cancelColor muchDarker;
  		borderWidth: 1;
  		label: 'X' font: Preferences standardButtonFont;
  		actionSelector: #delete;
  		setBalloonText: 'dismiss' translated.
  	^ aButton!

Item was changed:
  ----- Method: ObjectsTool>>initializeToStandAlone (in category 'initialization') -----
  initializeToStandAlone
  	"Initialize the receiver so that it can live as a stand-alone morph"
  	| buttonPane aBin aColor heights tabsPane |
  	self basicInitialize.
  
  	self layoutInset: 0;
  		layoutPolicy: ProportionalLayout new;
  		useRoundedCorners;
  		hResizing: #rigid;
  		vResizing: #rigid;
  		extent: (self minimumWidth @ self minimumHeight).
  
  	"mode buttons"
  	buttonPane := self paneForTabs: self modeTabs.
+ 	buttonPane color: (Color r: 1 g: 0.85 b: 0.975).
- 	buttonPane color: ColorTheme current dialogColor.
  	buttonPane
  		vResizing: #shrinkWrap;
  		setNameTo: 'ButtonPane';
  		addMorphFront: self dismissButton;
  		addMorphBack: self helpButton;
  		color: (aColor := buttonPane color) darker;
  		layoutInset: 5;
  		wrapDirection: nil;
  		width: self width;
  		layoutChanged; fullBounds.
  
  	"Place holder for a tabs or text pane"
  	tabsPane := Morph new.
  	tabsPane
+ 		color: (Color r: 1 g: 0.85 b: 0.975);
- 		color: ColorTheme current dialogColor;
  		setNameTo: 'TabPane';
  		hResizing: #spaceFill.
  
  	heights := { buttonPane height. 40 }.
  
  	buttonPane vResizing: #spaceFill.
  	self
  		addMorph: buttonPane
  		fullFrame: (LayoutFrame
  				fractions: (0 @ 0 corner: 1 @ 0)
  				offsets: (0 @ 0 corner: 0 @ heights first)).
  
  	self
  		addMorph: tabsPane
  		fullFrame: (LayoutFrame
  				fractions: (0 @ 0 corner: 1 @ 0)
  				offsets: (0 @ heights first corner: 0 @ (heights first + heights second))).
  
  	aBin := (PartsBin newPartsBinWithOrientation: #leftToRight from: #())
  		listDirection: #leftToRight;
  		wrapDirection: #topToBottom;
  		color: aColor lighter lighter;
  		setNameTo: 'Parts';
  		dropEnabled: false;
  		vResizing: #spaceFill;
  		yourself.
  
  	self
  		addMorph: aBin
  		fullFrame: (LayoutFrame
  				fractions: (0 @ 0 corner: 1 @ 1)
  				offsets: (0 @ (heights first + heights second) corner: 0 @ 0)).
  
  	self
+ 		borderWidth: 1;
+ 		borderColor: (Color r: 0.9 g: 0.801 b: 0.2);
+ 		color: (Color r: 1 g: 0.85 b: 0.975);
- 		borderWidth: ColorTheme current dialogBorderWidth;
- 		borderColor: ColorTheme current dialogBorderColor;
- 		color: ColorTheme current dialogColor;
  		setNameTo: 'Objects' translated;
  		showCategories.
  !

Item was changed:
  ----- Method: ObjectsTool>>paneForTabs: (in category 'tabs') -----
  paneForTabs: tabList 
  	"Answer a pane bearing tabs for the given list"
  	| aPane |
  	tabList do: [:t |
  			t color: Color transparent.
  			t borderWidth: 1;
  				borderColor: Color black].
  
  	aPane := AlignmentMorph newRow
+ 				color: (Color r: 1 g: 0.85 b: 0.975);
- 				color: ColorTheme current dialogColor;
  				listDirection: #leftToRight;
  				wrapDirection: #topToBottom;
  				vResizing: #spaceFill;
  				hResizing: #spaceFill;
  				cellInset: 6;
  				layoutInset: 4;
  				listCentering: #center;
  				listSpacing: #equal;
  				addAllMorphs: tabList;
  				yourself.
  
  	aPane width: self layoutBounds width.
  
  	^ aPane!



More information about the Squeak-dev mailing list