Merge pull request #76 from hpi-swa-teaching/master

release v0.6
hpi-swa-teaching · Jul 11, 2018 · f57f6f3 · f57f6f3
2 parents a286213 + 5bda1ab
commit f57f6f3
Show file tree

Hide file tree

Showing 161 changed files with 611 additions and 409 deletions.
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/actionForCorner..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/actionForCorner..st
@@ -0,0 +1,4 @@
+resizing
+actionForCorner: aSymbol
+
+	^ ('drag', aSymbol capitalized, 'Event:fromHandle:') asSymbol
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addHandleAt..st
@@ -0,0 +1,8 @@
+handles
+addHandleAt: aPosition
+
+	| handle |
+	handle := self createHandleOnMove: (self actionForCorner: aPosition).
+	handle setProperty: #morphicLayerNumber toValue: self handleLayerNumber.
+	self addMorphInLayer: handle.
+	self resizeHandles at: aPosition put: handle
diff --git a/...resenter-Core.package/PSContentContainer.class/instance/addHandleAtPosition.withIndex..st b/...resenter-Core.package/PSContentContainer.class/instance/addHandleAtPosition.withIndex..st
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/addResizeHandles.st
@@ -2,7 +2,9 @@ handles
 addResizeHandles
 
 	self hasHandles ifFalse: [
-		self corners
-			withIndexDo: [:each :index |
-				self addHandleAtPosition: each withIndex: index].
+		self addHandleAt: #topLeft.
+		self addHandleAt: #topRight.
+		self addHandleAt: #bottomRight.
+		self addHandleAt: #bottomLeft. 
+		self placeHandles.
 		self hasHandles: true]
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/...enter-Core.package/PSContentContainer.class/instance/createHandleAtPosition.withIndex..st b/...enter-Core.package/PSContentContainer.class/instance/createHandleAtPosition.withIndex..st
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/createHandleOnMove..st
@@ -0,0 +1,12 @@
+handles
+createHandleOnMove: aSymbol
+
+	| handle |
+	handle := RectangleMorph new
+		extent: self resizeHandleSize;
+		color: Color black.
+	handle
+		on: #mouseMove
+		send: aSymbol
+		to: self.
+	^ handle
diff --git a/...esenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent.fromHandle..st b/...esenter-Core.package/PSContentContainer.class/instance/dragBottomLeftEvent.fromHandle..st
@@ -0,0 +1,4 @@
+resizing
+dragBottomLeftEvent: evt fromHandle: handle
+
+	self extentBottomLeft: (self resizeFractionsOf: evt)
diff --git a/...senter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent.fromHandle..st b/...senter-Core.package/PSContentContainer.class/instance/dragBottomRightEvent.fromHandle..st
@@ -0,0 +1,4 @@
+resizing
+dragBottomRightEvent: evt fromHandle: handle
+
+	self extentBottomRight: (self resizeFractionsOf: evt)
diff --git a/.../Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st b/.../Presenter-Core.package/PSContentContainer.class/instance/dragCorner.event.fromHandle..st
@@ -1,9 +1,7 @@
 resizing
-dragCorner: index event: evt fromHandle: handle
-
-	| layoutFractions |
-	layoutFractions := self layoutFractionsOf: evt cursorPoint.
-	index caseOf: {	[1] -> [self extentTopLeft: layoutFractions]. 
-					[2] -> [self extentTopRight: layoutFractions].
-					[3] -> [self extentBottomRight: layoutFractions].
-					[4] -> [self extentBottomLeft: layoutFractions]}
+dragCorner: aSymbol event: event fromHandle: aMorph
+
+	self 
+		perform: (self actionForCorner: aSymbol) 
+		with: event
+		with: aMorph
diff --git a/.../Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent.fromHandle..st b/.../Presenter-Core.package/PSContentContainer.class/instance/dragTopLeftEvent.fromHandle..st
@@ -0,0 +1,4 @@
+resizing
+dragTopLeftEvent: evt fromHandle: handle
+
+	self extentTopLeft: (self resizeFractionsOf: evt)
diff --git a/...Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent.fromHandle..st b/...Presenter-Core.package/PSContentContainer.class/instance/dragTopRightEvent.fromHandle..st
@@ -0,0 +1,4 @@
+resizing
+dragTopRightEvent: evt fromHandle: handle
+
+	self extentTopRight: (self resizeFractionsOf: evt)
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/extentBottomLeft..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/extentBottomLeft..st
@@ -1,8 +1,7 @@
 resizing
 extentBottomLeft: aPoint
 
-	self
-		layoutFrame 
+	self	layoutFrame 
 		leftFraction: aPoint x;
 		bottomFraction: aPoint y.
 	self layoutChanged
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/extentBottomRight..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/extentBottomRight..st
@@ -1,8 +1,7 @@
 resizing
 extentBottomRight: aPoint
 
-	self
-		layoutFrame 
+	self	layoutFrame 
 		rightFraction: aPoint x;
 		bottomFraction: aPoint y.
 	self layoutChanged
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/extentTopLeft..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/extentTopLeft..st
@@ -1,8 +1,7 @@
 resizing
 extentTopLeft: aPoint
 
-	self
-		layoutFrame 
+	self	layoutFrame 
 		leftFraction: aPoint x;
 		topFraction: aPoint y.
 	self layoutChanged
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/extentTopRight..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/extentTopRight..st
@@ -1,8 +1,7 @@
 resizing
 extentTopRight: aPoint
 
-	self
-		layoutFrame 
+	self	layoutFrame 
 		rightFraction: aPoint x;
 		topFraction: aPoint y.
 	self layoutChanged
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/initialize.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/initialize.st
@@ -4,6 +4,6 @@ initialize
 	super initialize.
 	self 
 		color: Color transparent;
-		resizeHandles: OrderedCollection new;
+		resizeHandles: Dictionary new;
 		hasHandles: false;
 		addResizeHandles
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/isMagnetic.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/isMagnetic.st
@@ -0,0 +1,4 @@
+magnetic raster
+isMagnetic
+
+	^ self owner isMagnetic 
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,5 +1,5 @@
 resizing
 placeHandles
 
-	self resizeHandles withIndexDo: [:each :index | 
-		each center: (self corners at: index)]
+	self resizeHandles keysAndValuesDo:  [:key :each | 
+		each center: (self perform: key)]
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st b/packages/Presenter-Core.package/PSContentContainer.class/instance/rasterResolution.st
@@ -0,0 +1,4 @@
+magnetic raster
+rasterResolution
+
+	^ (0.04@0.03)
diff --git a/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeFractionsOf..st
@@ -0,0 +1,7 @@
+resizing
+resizeFractionsOf: anEvent
+
+	| layoutFractions |
+	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/resizeHandles..st b/packages/Presenter-Core.package/PSContentContainer.class/instance/resizeHandles..st
@@ -1,4 +1,4 @@
 accessing
-resizeHandles: anOrderedCollection
+resizeHandles: aDictionary
 
-	resizeHandles := anOrderedCollection
+	resizeHandles := aDictionary
diff --git a/...ntContainer.class/instance/addContent..st → ...ntContainer.class/instance/setContent..st b/...ntContainer.class/instance/addContent..st → ...ntContainer.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,40 +1,46 @@
 {
 	"class" : {
-		"for:" : "MK 5/18/2018 16:30" },
+		"for:" : "LB 7/6/2018 18:09" },
 	"instance" : {
-		"addContent:" : "LM 6/15/2018 19:11",
-		"addHandleAtPosition:withIndex:" : "MK 5/25/2018 17:37",
-		"addResizeHandles" : "MK 5/25/2018 17:39",
+		"actionForCorner:" : "LB 7/6/2018 16:30",
+		"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",
-		"createHandleAtPosition:withIndex:" : "MK 5/25/2018 17:37",
+		"createHandleOnMove:" : "LB 7/6/2018 16:26",
 		"defaultContextMenuContent" : "LM 6/17/2018 11:52",
 		"disablePresentationMode" : "WoC 6/17/2018 18:44",
-		"dragCorner:event:fromHandle:" : "MK 5/25/2018 17:10",
+		"dragBottomLeftEvent:fromHandle:" : "LB 7/6/2018 16:32",
+		"dragBottomRightEvent:fromHandle:" : "LB 7/6/2018 16:28",
+		"dragCorner:event:fromHandle:" : "LB 7/6/2018 16:35",
+		"dragTopLeftEvent:fromHandle:" : "LB 7/6/2018 16:32",
+		"dragTopRightEvent:fromHandle:" : "LB 7/6/2018 16:32",
 		"enablePresentationMode" : "LM 6/8/2018 20:10",
 		"extent:" : "MK 5/25/2018 17:11",
-		"extentBottomLeft:" : "MK 5/25/2018 17:12",
-		"extentBottomRight:" : "MK 5/25/2018 17:12",
-		"extentTopLeft:" : "MK 5/25/2018 17:12",
-		"extentTopRight:" : "MK 5/25/2018 17:12",
+		"extentBottomLeft:" : "LB 7/6/2018 15:57",
+		"extentBottomRight:" : "LB 7/6/2018 15:57",
+		"extentTopLeft:" : "LB 7/6/2018 15:57",
+		"extentTopRight:" : "LB 7/6/2018 15:57",
 		"filterEvent:for:" : "MK 6/1/2018 18:02",
 		"grabChild" : "LM 6/15/2018 16:32",
 		"handleLayerNumber" : "MK 5/25/2018 16:26",
 		"handlesMouseDown:" : "WoC 5/22/2018 19:48",
 		"hasHandles" : "MK 5/18/2018 19:42",
 		"hasHandles:" : "MK 5/25/2018 17:01",
 		"ifAnyHandleContains:do:" : "MK 5/25/2018 17:06",
-		"initialize" : "MK 5/25/2018 17:10",
-		"layoutFractionsOf:" : "LB 5/22/2018 16:09",
+		"initialize" : "LB 7/6/2018 15:35",
+		"isMagnetic" : "LB 7/5/2018 21:38",
 		"mouseDown:" : "MK 6/1/2018 16:25",
 		"notifySlideRescale:" : "LM 6/17/2018 19:02",
-		"placeHandles" : "WoC 6/17/2018 13:22",
+		"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 17:48",
 		"resizeHandleSize" : "MK 5/18/2018 19:13",
 		"resizeHandles" : "MK 5/18/2018 17:43",
-		"resizeHandles:" : "MK 5/18/2018 17:44" } }
+		"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/...dingMessage.class/instance/setContent..st → ...ingMessage.class/instance/withMessage..st b/...dingMessage.class/instance/setContent..st → ...ingMessage.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/PSMiniature.class/class/forSlide..st b/packages/Presenter-Core.package/PSMiniature.class/class/forSlide..st
@@ -1,4 +1,6 @@
 as yet unclassified
 forSlide: aPSSlide
 
-	^ self new setSlide: aPSSlide
+	^ self new 
+		slide: aPSSlide;
+		yourself
diff --git a/packages/Presenter-Core.package/PSMiniature.class/instance/defaultSize.st b/packages/Presenter-Core.package/PSMiniature.class/instance/defaultSize.st
diff --git a/packages/Presenter-Core.package/PSMiniature.class/instance/defaultWidth.st b/packages/Presenter-Core.package/PSMiniature.class/instance/defaultWidth.st
@@ -0,0 +1,4 @@
+accessing
+defaultWidth
+
+	^ 80
diff --git a/packages/Presenter-Core.package/PSMiniature.class/instance/formSize.st b/packages/Presenter-Core.package/PSMiniature.class/instance/formSize.st
@@ -0,0 +1,4 @@
+accessing
+formSize
+
+ 	^ self defaultWidth @ (self defaultWidth * self slide sideRatio)