diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent..st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent.for..st similarity index 84% rename from packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent..st rename to packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent.for..st index 2f94d320..1a106ac2 100644 --- a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent..st +++ b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.extent.for..st @@ -1,8 +1,8 @@ instance creation -newWithBackendClass: aBackendClass viewportClass: aViewPortClass extent: aPoint +newWithBackendClass: aBackendClass viewportClass: aViewPortClass extent: aPoint for: aMorphicMonet | canvas context backend viewPort | canvas := self basicNew. - context := M2DrawingContext new. + context := M2DrawingContext newFor: aMorphicMonet. backend := aBackendClass basicNew. viewPort := aViewPortClass basicNew. context diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass..st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.for..st similarity index 66% rename from packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass..st rename to packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.for..st index 55885d4c..96088220 100644 --- a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass..st +++ b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithBackendClass.viewportClass.for..st @@ -1,3 +1,3 @@ instance creation -newWithBackendClass: aBackendClass viewportClass: aViewPortClass - ^ self newWithBackendClass: aBackendClass viewportClass: aViewPortClass extent: self defaultExtent +newWithBackendClass: aBackendClass viewportClass: aViewPortClass for: aMorphicMonet + ^ self newWithBackendClass: aBackendClass viewportClass: aViewPortClass extent: self defaultExtent for: aMorphicMonet diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaults.st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaults.st deleted file mode 100644 index f8d90b9c..00000000 --- a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaults.st +++ /dev/null @@ -1,3 +0,0 @@ -instance creation -newWithDefaults - ^ self newWithExtent: self defaultExtent diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaultsFor..st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaultsFor..st new file mode 100644 index 00000000..90a337fd --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithDefaultsFor..st @@ -0,0 +1,3 @@ +instance creation +newWithDefaultsFor: aMorphicMonet + ^ self newWithExtent: self defaultExtent for: aMorphicMonet diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent..st b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent.for..st similarity index 51% rename from packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent..st rename to packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent.for..st index 8a8ac5a9..b7e7b696 100644 --- a/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent..st +++ b/packages/SketchMorph2-Core.package/M2Canvas.class/class/newWithExtent.for..st @@ -1,3 +1,3 @@ instance creation -newWithExtent: aPoint - ^ self newWithBackendClass: M2Backend viewportClass: M2ViewPort extent: aPoint +newWithExtent: aPoint for: aMorphicMonet + ^ self newWithBackendClass: M2Backend viewportClass: M2ViewPort extent: aPoint for: aMorphicMonet diff --git a/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json index c4ac77c6..bba21b5d 100644 --- a/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/M2Canvas.class/methodProperties.json @@ -2,10 +2,10 @@ "class" : { "defaultBackgroundColor" : "SW 6/14/2022 19:26", "defaultExtent" : "md 6/17/2022 16:04", - "newWithBackendClass:viewportClass:" : "md 6/17/2022 16:11", - "newWithBackendClass:viewportClass:extent:" : "md 7/11/2022 17:38", - "newWithDefaults" : "md 6/17/2022 16:07", - "newWithExtent:" : "md 6/17/2022 16:10" }, + "newWithBackendClass:viewportClass:extent:for:" : "kbr 7/19/2022 16:30", + "newWithBackendClass:viewportClass:for:" : "kbr 7/19/2022 16:27", + "newWithDefaultsFor:" : "kbr 7/19/2022 15:59", + "newWithExtent:for:" : "kbr 7/19/2022 16:02" }, "instance" : { "addGripMorph:" : "JP 5/19/2021 00:31", "backend" : "md 7/11/2022 17:38", diff --git a/packages/SketchMorph2-Core.package/M2DrawingContext.class/class/newFor..st b/packages/SketchMorph2-Core.package/M2DrawingContext.class/class/newFor..st new file mode 100644 index 00000000..61986968 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2DrawingContext.class/class/newFor..st @@ -0,0 +1,3 @@ +instance creation +newFor: aMorphicMonet + ^ self new morphicMonet: aMorphicMonet \ No newline at end of file diff --git a/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet..st b/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet..st new file mode 100644 index 00000000..8808b5f8 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet..st @@ -0,0 +1,4 @@ +accessing +morphicMonet: aMorphicMonet + morphicMonet := aMorphicMonet + diff --git a/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet.st b/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet.st new file mode 100644 index 00000000..29ae2547 --- /dev/null +++ b/packages/SketchMorph2-Core.package/M2DrawingContext.class/instance/morphicMonet.st @@ -0,0 +1,3 @@ +accessing +morphicMonet + ^ morphicMonet diff --git a/packages/SketchMorph2-Core.package/M2DrawingContext.class/methodProperties.json b/packages/SketchMorph2-Core.package/M2DrawingContext.class/methodProperties.json index 6543a9a3..51a0c15e 100644 --- a/packages/SketchMorph2-Core.package/M2DrawingContext.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/M2DrawingContext.class/methodProperties.json @@ -1,6 +1,6 @@ { "class" : { - }, + "newFor:" : "kbr 7/19/2022 16:30" }, "instance" : { "activeTool" : "md 7/16/2022 22:59", "activeTool:" : "md 7/16/2022 23:03", @@ -49,6 +49,8 @@ "isInTextMode" : "CS 6/11/2021 17:30", "mode" : "CS 6/28/2021 17:33", "mode:" : "CS 6/11/2021 17:30", + "morphicMonet" : "kbr 7/19/2022 15:03", + "morphicMonet:" : "kbr 7/19/2022 15:04", "pencilSize" : "CS 6/11/2021 17:33", "pencilSize:" : "md 7/16/2022 22:48", "rectangleBrushSize" : "md 6/18/2022 17:26", diff --git a/packages/SketchMorph2-Core.package/M2DrawingContext.class/properties.json b/packages/SketchMorph2-Core.package/M2DrawingContext.class/properties.json index bf8ea72b..33e8340d 100644 --- a/packages/SketchMorph2-Core.package/M2DrawingContext.class/properties.json +++ b/packages/SketchMorph2-Core.package/M2DrawingContext.class/properties.json @@ -18,6 +18,7 @@ "eraserSize", "isFillingGeometricForm", "mode", + "morphicMonet", "pencilSize" ], "name" : "M2DrawingContext", "pools" : [ diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/class/open.st b/packages/SketchMorph2-Core.package/MorphicMonet.class/class/open.st index 1d97163e..c307b199 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/class/open.st +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/class/open.st @@ -1,3 +1,3 @@ instance creation open - ^ self openWith: M2Canvas newWithDefaults + ^ self openWith: (M2Canvas newWithDefaultsFor: self) diff --git a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json index d8f8ee43..0e38fead 100644 --- a/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json +++ b/packages/SketchMorph2-Core.package/MorphicMonet.class/methodProperties.json @@ -2,7 +2,7 @@ "class" : { "addToWorldMenu" : "K.P. 5/27/2021 11:21", "newWith:" : "CS 8/5/2021 21:57", - "open" : "md 6/17/2022 16:08", + "open" : "kbr 7/19/2022 15:49", "openWith:" : "6/28/2021 21:03:28" }, "instance" : { "activateDefaultItem" : "CS 8/5/2021 22:07", diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/setUp.st b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/setUp.st index fdc5c467..0267cc65 100644 --- a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/setUp.st +++ b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/instance/setUp.st @@ -2,7 +2,7 @@ running setUp | canvas | super setUp. - canvas := M2Canvas newWithExtent: 100 asPoint. + canvas := M2Canvas newWithExtent: 100 asPoint for: self. self canvas: canvas; backend: canvas backend; diff --git a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json index 5f6771b9..6f56abdd 100644 --- a/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json +++ b/packages/SketchMorph2-Tests.package/M2DrawingComponentTests.class/methodProperties.json @@ -70,7 +70,7 @@ "prepareTestOnNewLayer" : "md 6/26/2022 14:10", "releaseShift" : "ms 5/27/2022 16:47", "renderCanvas" : "md 6/18/2022 17:55", - "setUp" : "md 6/18/2022 17:54", + "setUp" : "kbr 7/19/2022 16:01", "tearDown" : "mk 7/25/2020 16:26", "testBrushSize" : "CS 7/8/2021 12:17", "testBrushSizeOnNewLayer" : "md 6/26/2022 14:21", diff --git a/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/instance/setUp.st b/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/instance/setUp.st index 00400d48..24f8a1c0 100644 --- a/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/instance/setUp.st +++ b/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/instance/setUp.st @@ -3,4 +3,5 @@ setUp self wantsToTest: (MorphicMonetMock newWith: (M2Canvas newWithBackendClass: M2BackendMock - viewportClass: M2ViewPort)) + viewportClass: M2ViewPort + for: MorphicMonetMock)) diff --git a/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/methodProperties.json b/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/methodProperties.json index 48b0358c..80ef4983 100644 --- a/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/methodProperties.json +++ b/packages/SketchMorph2-Tests.package/MorphicMonetTests.class/methodProperties.json @@ -12,7 +12,7 @@ "isButtonActivated:" : "ms 7/26/2021 14:32", "isButtonEnabled:" : "ms 7/26/2021 14:32", "menuButtonsDict" : "md 7/16/2022 23:51", - "setUp" : "md 6/17/2022 16:34", + "setUp" : "kbr 7/19/2022 16:04", "testAreButtonNamesUnique" : "K.P. 8/1/2021 19:42", "testAreColorMorphsThere" : "CS 8/4/2021 17:58", "testAreCustomizableColorMorphsThere" : "CS 8/4/2021 17:58",