Multiple minor refactorings

LeonBein · LeonBein · commit 591b293db2f4 · 2018-07-06T18:11:33.000+02:00
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/class/for..st b/packages/Presenter-Core.package/PSContentContainer.class/class/for..st
@@ -1,4 +1,4 @@
 instance creation
 for: aMorph
 
-	^ self new addContent: aMorph
+	^ self new setContent: aMorph
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st
@@ -1,8 +1,8 @@
 handles
-addHandleAt: aPositionSelector
+addHandleAt: aPosition
 
 	| handle |
-	handle := self createHandleOnMove: (self actionForCorner: aPositionSelector).
+	handle := self createHandleOnMove: (self actionForCorner: aPosition).
 	handle setProperty: #morphicLayerNumber toValue: self handleLayerNumber.
 	self addMorphInLayer: handle.
-	self resizeHandles at: aPositionSelector put: handle
+	self resizeHandles at: aPosition put: handle
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/corners.st
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/layoutFractionsOf..st
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/placeHandles.st
@@ -1,6 +1,5 @@
 resizing
 placeHandles
 
-	self flag: #TODO. "Meta programming"
 	self resizeHandles keysAndValuesDo:  [:key :each | 
 		each center: (self perform: key)]
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st
@@ -2,6 +2,6 @@ resizing
 resizeFractionsOf: anEvent
 	
 	| layoutFractions |
-	layoutFractions := self layoutFractionsOf: anEvent cursorPoint.
+	layoutFractions := self owner layoutFractionsOf: anEvent cursorPoint.
 	self isMagnetic ifTrue: [layoutFractions := layoutFractions roundTo: self rasterResolution].
 	^ layoutFractions
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/setContent..st
@@ -1,5 +1,5 @@
 contentHandling
-addContent: aMorph
+setContent: aMorph
 	
 	self 
 		position: aMorph position;
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSContentContainer.class/methodProperties.json
@@ -1,15 +1,13 @@
 {
 	"class" : {
-		"for:" : "MK 5/18/2018 16:30" },
+		"for:" : "LB 7/6/2018 18:09" },
 	"instance" : {
 		"actionForCorner:" : "LB 7/6/2018 16:30",
-		"addContent:" : "LM 6/15/2018 19:11",
-		"addHandleAt:" : "LB 7/6/2018 16:31",
+		"addHandleAt:" : "LB 7/6/2018 18:07",
 		"addResizeHandles" : "LB 7/6/2018 16:15",
 		"child" : "MK 5/18/2018 20:03",
 		"child:" : "LM 5/21/2018 12:48",
 		"copyChildToHand" : "LM 6/17/2018 11:52",
-		"corners" : "MK 5/25/2018 17:11",
 		"createContextMenu" : "LB 6/15/2018 21:42",
 		"createHandleOnMove:" : "LB 7/6/2018 16:26",
 		"defaultContextMenuContent" : "LM 6/17/2018 11:52",
@@ -34,15 +32,15 @@
 		"ifAnyHandleContains:do:" : "MK 5/25/2018 17:06",
 		"initialize" : "LB 7/6/2018 15:35",
 		"isMagnetic" : "LB 7/5/2018 21:38",
-		"layoutFractionsOf:" : "LB 7/5/2018 19:42",
 		"mouseDown:" : "MK 6/1/2018 16:25",
 		"notifySlideRescale:" : "LM 6/17/2018 19:02",
-		"placeHandles" : "LB 7/6/2018 15:43",
+		"placeHandles" : "LB 7/6/2018 18:10",
 		"rasterResolution" : "LB 7/5/2018 19:42",
 		"removeResizeHandles" : "MK 5/25/2018 16:18",
 		"removedMorph:" : "WoC 5/23/2018 18:40",
 		"resizeChild" : "MK 5/18/2018 20:03",
-		"resizeFractionsOf:" : "LB 7/6/2018 16:20",
+		"resizeFractionsOf:" : "LB 7/6/2018 17:48",
 		"resizeHandleSize" : "MK 5/18/2018 19:13",
 		"resizeHandles" : "MK 5/18/2018 17:43",
-		"resizeHandles:" : "LB 7/6/2018 15:35" } }
+		"resizeHandles:" : "LB 7/6/2018 15:35",
+		"setContent:" : "LB 7/6/2018 18:08" } }
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st b/packages/Presenter-Core.package/PSFadingMessage.class/class/for..st
@@ -1,4 +1,4 @@
 nil
 for: aString
 
-	^ self new setContent: aString
+	^ self new withMessage: aString
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/alphaThreshold.st
@@ -0,0 +1,4 @@
+accessing
+alphaThreshold
+
+	^ 1000
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/content..st
@@ -1,4 +1,4 @@
 accessing
-content: anObject
+content: aMorph
 	
-	content := anObject
+	content := aMorph
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/remaining..st
@@ -1,4 +1,4 @@
 accessing
-remaining: anObject
+remaining: aNumber
 	
-	remaining := anObject
+	remaining := aNumber
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/updateColor.st
@@ -3,7 +3,7 @@ updateColor
 	
 	| alpha |
 	self remaining: self remaining - 10.
-	self remaining < 1000 
+	self remaining < self alphaThreshold 
 		ifTrue: [
-			alpha := remaining / 1000.0.
+			alpha := remaining / self alphaThreshold.
 			self color: (self color alpha: alpha)]
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st b/packages/Presenter-Core.package/PSFadingMessage.class/instance/withMessage..st
@@ -1,5 +1,5 @@
 accessing
-setContent: aString
+withMessage: aString
 
 	self content contents: aString.		"here no cascade because it fixes a presentation bug"
 	self bounds: (self content position corner: self content bottomRight + self defaultPadding).
diff --git a/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json b/packages/Presenter-Core.package/PSFadingMessage.class/methodProperties.json
@@ -1,18 +1,19 @@
 {
 	"class" : {
-		"for:" : "WoC 6/15/2018 17:24" },
+		"for:" : "LB 7/6/2018 18:05" },
 	"instance" : {
 		"active" : "WoC 6/15/2018 19:23",
 		"active:" : "WoC 6/15/2018 19:23",
+		"alphaThreshold" : "LB 7/6/2018 18:03",
 		"content" : "WoC 6/15/2018 17:21",
-		"content:" : "WoC 6/15/2018 17:21",
+		"content:" : "LB 7/6/2018 18:02",
 		"defaultPadding" : "WoC 6/15/2018 17:31",
 		"fadingTime" : "WoC 6/15/2018 17:46",
 		"initialize" : "WoC 6/15/2018 19:23",
 		"isActive" : "WoC 6/15/2018 19:23",
 		"remaining" : "WoC 6/15/2018 17:41",
-		"remaining:" : "WoC 6/15/2018 17:41",
-		"setContent:" : "WoC 6/15/2018 18:13",
+		"remaining:" : "LB 7/6/2018 18:03",
 		"step" : "WoC 6/15/2018 17:43",
 		"stepTime" : "WoC 6/15/2018 17:55",
-		"updateColor" : "WoC 6/15/2018 17:54" } }
+		"updateColor" : "LB 7/6/2018 18:03",
+		"withMessage:" : "LB 7/6/2018 18:05" } }
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/changed.st b/packages/Presenter-Core.package/PSSlide.class/instance/changed.st
@@ -1,4 +1,4 @@
-as yet unclassified
+updating
 changed
 
 	super changed.
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st b/packages/Presenter-Core.package/PSSlide.class/instance/disablePresentationMode.st
@@ -1,5 +1,4 @@
 presentation mode
 disablePresentationMode 
 
-	self submorphsDo: [:each | each disablePresentationMode].
-	"self hideSlideNumberMorphHandles"
+	self submorphsDo: [:each | each disablePresentationMode]
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFractionsOf..st
@@ -0,0 +1,5 @@
+contentHandling
+layoutFractionsOf: aPoint
+
+	^ aPoint - self position / self extent
+	
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st b/packages/Presenter-Core.package/PSSlide.class/instance/layoutFrameFor..st
@@ -2,6 +2,6 @@ contentHandling
 layoutFrameFor: aMorph
 
 	| upperLeft lowerRight |
-	upperLeft := (aMorph position - self position) / self extent.
+	upperLeft := self layoutFractionsOf: aMorph position.
 	lowerRight := upperLeft + (aMorph extent / self extent).
 	^ (LayoutFrame fractions: (upperLeft corner: lowerRight))
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/model.st b/packages/Presenter-Core.package/PSSlide.class/instance/model.st
@@ -1,4 +1,4 @@
-as yet unclassified
+model
 model
 
 	^ model
diff --git a/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st b/packages/Presenter-Core.package/PSSlide.class/instance/mouseDown..st
@@ -4,4 +4,4 @@ mouseDown: evt
 	super mouseDown: evt.
 	evt redButtonPressed 
 		ifTrue: [self waitForDoubleClick: evt].
-	self fullBounds
+	"self fullBounds"
diff --git a/packages/Presenter-Core.package/PSSlide.class/methodProperties.json b/packages/Presenter-Core.package/PSSlide.class/methodProperties.json
@@ -5,7 +5,7 @@
 		"acceptDroppingMorph:event:" : "LB 5/23/2018 15:46",
 		"addContent:" : "LB 7/5/2018 19:57",
 		"changed" : "LB 6/29/2018 16:57",
-		"disablePresentationMode" : "WoC 6/27/2018 14:13",
+		"disablePresentationMode" : "LB 7/6/2018 18:00",
 		"doubleClick:" : "LM 5/25/2018 17:20",
 		"enablePresentationMode" : "MK 5/25/2018 15:11",
 		"extent:" : "LB 6/6/2018 14:49",
@@ -15,9 +15,10 @@
 		"initialize" : "LM 7/6/2018 16:48",
 		"isImageFileName:" : "LB 5/18/2018 17:16",
 		"isMagnetic" : "LB 7/5/2018 21:41",
-		"layoutFrameFor:" : "LB 6/15/2018 21:36",
+		"layoutFractionsOf:" : "LB 7/6/2018 17:47",
+		"layoutFrameFor:" : "LB 7/6/2018 17:47",
 		"model" : "LB 7/5/2018 20:03",
-		"mouseDown:" : "LM 5/25/2018 17:21",
+		"mouseDown:" : "LB 7/6/2018 17:58",
 		"prepareToBeSaved" : "LB 6/22/2018 19:33",
 		"resizeMorphHeightToFit:" : "LB 5/18/2018 17:36",
 		"resizeMorphToFit:" : "LB 5/18/2018 17:36",
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/occupiesWorld.st
@@ -0,0 +1,5 @@
+stepping and presenter
+occupiesWorld
+
+	^ self extent = self world extent 
+		and: [self position = (0@0)]
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st b/packages/Presenter-Core.package/PSSlideContainer.class/instance/step.st
@@ -2,6 +2,5 @@ stepping and presenter
 step
 
 	self model presentationMode ifFalse: [^self].
-	(self extent ~= self world extent 
-		or: [self position ~= (0@0)])
-		ifTrue: [self occupyWorld: self world]
+	self occupiesWorld 
+		ifFalse: [self occupyWorld: self world]
diff --git a/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json b/packages/Presenter-Core.package/PSSlideContainer.class/methodProperties.json
@@ -27,6 +27,7 @@
 		"makeMeVisible" : "WoC 6/3/2018 00:10",
 		"notification" : "WoC 6/15/2018 19:21",
 		"notification:" : "WoC 6/15/2018 19:21",
+		"occupiesWorld" : "LB 7/6/2018 17:43",
 		"occupyWorld:" : "JZ 6/29/2018 19:01",
 		"presentationCommandShortcuts" : "MK 6/28/2018 13:40",
 		"presentationCommandShortcuts:" : "MK 6/28/2018 14:03",
@@ -46,6 +47,6 @@
 		"sharedShortcuts" : "LB 6/29/2018 15:45",
 		"showNotification:" : "LM 6/22/2018 15:40",
 		"showSlide:" : "LB 5/6/2018 16:49",
-		"step" : "JZ 6/29/2018 19:02",
+		"step" : "LB 7/6/2018 17:44",
 		"stepTime" : "JZ 6/29/2018 18:56",
 		"wantsDroppedMorph:event:" : "MK 6/7/2018 09:29" } }

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +accessing
 +alphaThreshold
++
 +	^ 1000