[squeak-dev] The Trunk: Morphic-tpr.1349.mcz

commits at source.squeak.org commits at source.squeak.org
Wed Sep 20 01:18:19 UTC 2017


tim Rowledge uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-tpr.1349.mcz

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

Name: Morphic-tpr.1349
Author: tpr
Time: 19 September 2017, 6:17:46.121858 pm
UUID: 81de60d2-86b3-405d-9a20-80b41eff2ec5
Ancestors: Morphic-tpr.1348

Some small fixes for the ScorePlayer - the sliders for speed/volume/moving-through-piano-roll and the indinvidual track volume/stereo position need increasing in height in order to work.
We still have a very strange problem caused by the change in selecting-from-a-list circa august 2016. When trying to choose a new instrument for a track we now use a list chooser dialog that appears to fervently keep a grip on the hand focus. To see the possible culprit, look at versions of MorphicUIManager>>#chooseFrom:lines:title: and revert back to the march 15 2010 version.

=============== Diff against Morphic-tpr.1348 ===============

Item was changed:
  ----- Method: ScorePlayerMorph>>panAndVolControlsFor: (in category 'layout') -----
  panAndVolControlsFor: trackIndex
  
  	| volSlider panSlider c r middleLine pianoRollColor |
  	pianoRollColor := (Color wheel: scorePlayer score tracks size) at: trackIndex.
  	volSlider := SimpleSliderMorph new
  		color: color;
  		sliderColor: pianoRollColor;
+ 		extent: 101 at 6;
- 		extent: 101 at 2;
  		target: scorePlayer;
  		arguments: (Array with: trackIndex);
  		actionSelector: #volumeForTrack:put:;
  		minVal: 0.0;
  		maxVal: 1.0;
  		adjustToValue: (scorePlayer volumeForTrack: trackIndex).
  	panSlider := SimpleSliderMorph new
  		color: color;
  		sliderColor: pianoRollColor;
+ 		extent: 101 at 6;
- 		extent: 101 at 2;
  		target: scorePlayer;
  		arguments: (Array with: trackIndex);
  		actionSelector: #panForTrack:put:;
  		minVal: 0.0;
  		maxVal: 1.0;		
  		adjustToValue: (scorePlayer panForTrack: trackIndex).
  	c := AlignmentMorph newColumn
  		color: color;
  		layoutInset: 0;
  		wrapCentering: #center; cellPositioning: #topCenter;
  		hResizing: #spaceFill;
  		vResizing: #shrinkWrap.
  	middleLine := Morph new  "center indicator for pan slider"
  		color: (Color r: 0.4 g: 0.4 b: 0.4);
  		extent: 1@(panSlider height - 4);
  		position: panSlider center x@(panSlider top + 2).
  	panSlider addMorphBack: middleLine.
  	r := self makeRow.
  	r addMorphBack: (StringMorph contents: '0').
  	r addMorphBack: volSlider.
  	r addMorphBack: (StringMorph contents: '10').
  	c addMorphBack: r.
  	r := self makeRow.
  	r addMorphBack: (StringMorph contents: 'L' translated).
  	r addMorphBack: panSlider.
  	r addMorphBack: (StringMorph contents: 'R' translated).
  	c addMorphBack: r.
  	^ c
  !

Item was changed:
  ----- Method: ScorePlayerMorph>>rateControl (in category 'layout') -----
  rateControl
  
  	| rateSlider middleLine r |
  	rateSlider := SimpleSliderMorph new
  		color: color;
  		sliderColor: Color gray;
+ 		extent: 180 at 6;
- 		extent: 180 at 2;
  		target: self;
  		actionSelector: #setLogRate:;
  		minVal: -1.0;
  		maxVal: 1.0;
  		adjustToValue: 0.0.
  	middleLine := Morph new  "center indicator for pan slider"
  		color: (Color r: 0.4 g: 0.4 b: 0.4);
  		extent: 1@(rateSlider height - 4);
  		position: rateSlider center x@(rateSlider top + 2).
  	rateSlider addMorphBack: middleLine.
  	r := self makeRow
  		hResizing: #shrinkWrap;
  		vResizing: #rigid;
  		height: 24.
  	r addMorphBack: (StringMorph contents: 'slow ' translated).
  	r addMorphBack: rateSlider.
  	r addMorphBack: (StringMorph contents: ' fast' translated).
  	^ r
  !

Item was changed:
  ----- Method: ScorePlayerMorph>>scrollControl (in category 'layout') -----
  scrollControl
  
  	| r |
  	scrollSlider := SimpleSliderMorph new
  		color: color;
  		sliderColor: Color gray;
+ 		extent: 360 at 6;
- 		extent: 360 at 2;
  		target: scorePlayer;
  		actionSelector: #positionInScore:;
  		adjustToValue: scorePlayer positionInScore.
  	r := self makeRow
  		hResizing: #shrinkWrap;
  		vResizing: #rigid;
  		height: 24.
  	r addMorphBack: (StringMorph contents: 'start ' translated).
  	r addMorphBack: scrollSlider.
  	r addMorphBack: (StringMorph contents: ' end' translated).
  	^ r
  !

Item was changed:
  ----- Method: ScorePlayerMorph>>trackControlsFor: (in category 'layout') -----
  trackControlsFor: trackIndex
  
  	| r |
  	r := self makeRow
+ 		hResizing: #spaceFill;
- 		hResizing: #shrinkWrap;
  		vResizing: #shrinkWrap.
  	r addMorphBack: (self trackNumAndMuteButtonFor: trackIndex).
  	r addMorphBack: (Morph new extent: 10 at 5; color: color).  "spacer"
  	r addMorphBack: (self panAndVolControlsFor: trackIndex).
  	^ r
  !

Item was changed:
  ----- Method: ScorePlayerMorph>>trackNumAndMuteButtonFor: (in category 'layout') -----
  trackNumAndMuteButtonFor: trackIndex
  
  	| muteButton instSelector pianoRollColor r |
  	muteButton := SimpleSwitchMorph new
  		onColor: (Color r: 1.0 g: 0.6 b: 0.6);
  		offColor: color;
  		color: color;
  		label: 'Mute' translated;
  		target: scorePlayer;
  		actionSelector: #mutedForTrack:put:;
  		arguments: (Array with: trackIndex).
  	instSelector := PopUpChoiceMorph new
  		extent: 95 at 14;
  		contentsClipped: 'oboe1';
  		target: self;
  		actionSelector: #atTrack:from:selectInstrument:;
  		getItemsSelector: #instrumentChoicesForTrack:;
  		getItemsArgs: (Array with: trackIndex).
  	instSelector arguments:
  		(Array with: trackIndex with: instSelector).
  	instrumentSelector at: trackIndex put: instSelector.
  
  	"select track color using same color list as PianoRollScoreMorph"
  	pianoRollColor := (Color wheel: scorePlayer score tracks size) at: trackIndex.
  
  	r := self makeRow
+ 		hResizing: #spaceFill;
- 		hResizing: #rigid;
  		vResizing: #spaceFill;
  		extent: 70 at 10.
  	r addMorphBack:
  		((StringMorph
  			contents: trackIndex printString
  			font: (TextStyle default fontOfSize: 24)) color: pianoRollColor).
  	trackIndex < 10
  		ifTrue: [r addMorphBack: (Morph new color: color; extent: 19 at 8)]  "spacer"
  		ifFalse: [r addMorphBack: (Morph new color: color; extent: 8 at 8)].  "spacer"
  	r addMorphBack:
  		(StringMorph new
  			extent: 140 at 14;
  			contentsClipped: (scorePlayer infoForTrack: trackIndex)).
  	r addMorphBack: (Morph new color: color; extent: 8 at 8).  "spacer"
  	r addMorphBack: instSelector.
  	r addMorphBack: (AlignmentMorph newRow color: color).  "spacer"
  	r addMorphBack: muteButton.
  	^ r
  !

Item was changed:
  ----- Method: ScorePlayerMorph>>volumeControl (in category 'layout') -----
  volumeControl
  
  	| volumeSlider r |
  	volumeSlider := SimpleSliderMorph new
  		color: color;
  		sliderColor: Color gray;
+ 		extent: 80 at 6;
- 		extent: 80 at 2;
  		target: scorePlayer;
  		actionSelector: #overallVolume:;
  		adjustToValue: scorePlayer overallVolume.
  	r := self makeRow
  		hResizing: #shrinkWrap;
  		vResizing: #rigid;
  		height: 24.
  	r addMorphBack: (StringMorph contents: 'soft  ' translated).
  	r addMorphBack: volumeSlider.
  	r addMorphBack: (StringMorph contents: ' loud' translated).
  	^ r
  !



More information about the Squeak-dev mailing list