Fixed MgdGameModel>>#initializeForSymbols:

RalfBarkow · Nov 9, 2017 · 8af0857 · 8af0857
1 parent 2bddbba
commit 8af0857
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 28 deletions.
diff --git a/src/Bloc-MemoryGame-Demo.package/MgdGameModel.class/instance/initializeForSymbols..st b/src/Bloc-MemoryGame-Demo.package/MgdGameModel.class/instance/initializeForSymbols..st
@@ -13,4 +13,4 @@ initializeForSymbols: aCollectionOfCharacters
 	availableCards := (aCollectionOfCharacters asArray
 			collect: [ :aSymbol | 
 				(1 to: self matchesCount) collect: [ :i | 
-					MgCardModel new symbol: aSymbol ] ] ) flattened shuffled asOrderedCollection
+					MgdCardModel new symbol: aSymbol ] ] ) flattened shuffled asOrderedCollection
diff --git a/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawBacksideOn..st b/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawBacksideOn..st
@@ -0,0 +1,12 @@
+drawing
+drawBacksideOn: aCanvas
+
+	aCanvas stroke
+		paint: Color paleBlue;
+		path: (aCanvas shape line: 0@0 to: self extent);
+		draw.
+
+	aCanvas stroke
+		paint: Color paleBlue;
+		path: (aCanvas shape line: self width @ 0 to: 0@self height);
+		draw
diff --git a/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawBacksideOnSpartaCanvas..st b/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawBacksideOnSpartaCanvas..st
diff --git a/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawCommonOn..st b/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawCommonOn..st
@@ -0,0 +1,6 @@
+drawing
+drawCommonOn: aCanvas
+	aCanvas fill
+		paint: self backgroundPaint;
+		path: self boundsInLocal;
+		draw
diff --git a/...nstance/drawFlippedSideOnSpartaCanvas..st → ...ment.class/instance/drawFlippedSideOn..st b/...nstance/drawFlippedSideOnSpartaCanvas..st → ...ment.class/instance/drawFlippedSideOn..st
@@ -1,5 +1,5 @@
 drawing
-drawFlippedSideOnSpartaCanvas: aCanvas
+drawFlippedSideOn: aCanvas
 	| font textPainter metrics baseline origin |
 
 	font := aCanvas font

diff --git a/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawOnSpartaCanvas..st b/src/Bloc-MemoryGame.package/MgRawCardElement.class/instance/drawOnSpartaCanvas..st
@@ -3,17 +3,13 @@ drawOnSpartaCanvas: aCanvas
 	| roundedRectangle |
 
 	roundedRectangle := aCanvas shape 
-			roundedRectangle: self boundsInLocal 
-			radii: (BlCornerRadii radius: self cornerRadius).
-	
+		roundedRectangle: self boundsInLocal 
+		radii: (BlCornerRadii radius: self cornerRadius).
+
 	aCanvas clip
 		by: roundedRectangle
 		during: [
-			aCanvas fill
-				paint: self backgroundPaint;
-				path: self boundsInLocal;
-				draw.
-
+			self drawCommonOn: aCanvas.
 			self card isFlipped
-				ifTrue: [ self drawFlippedSideOnSpartaCanvas: aCanvas ]
-				ifFalse: [ self drawBacksideOnSpartaCanvas: aCanvas ] ]
+				ifTrue: [ self drawFlippedSideOn: aCanvas ]
+				ifFalse: [ self drawBacksideOn: aCanvas ] ]