fixed bug with color picker

hpi-swa-teaching · Jun 20, 2019 · 229addc · 229addc
1 parent 18a4431
commit 229addc
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/...ass/instance/storeSelectionInParagraph.st → ...TextEditor.class/instance/iblyFrom.to..st b/...ass/instance/storeSelectionInParagraph.st → ...TextEditor.class/instance/iblyFrom.to..st
diff --git a/...chTextEditor.class/instance/initialize.st → ...ackage/RichTextEditor.class/instance/t.st b/...chTextEditor.class/instance/initialize.st → ...ackage/RichTextEditor.class/instance/t.st
diff --git a/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextEditor.class/methodProperties.json
@@ -11,11 +11,11 @@
 		"click:" : "ls 6/19/2019 21:06",
 		"crWithIndent:" : "LM 5/26/2019 22:45",
 		"getParagraphCharacter" : "LM 5/26/2019 22:52",
-		"initialize" : "",
+		"iblyFrom:to:" : " 6/20/2019 13:17:31",
 		"isNewCharacter:" : "ls 6/20/2019 00:42",
 		"keyStroke:" : "ls 6/20/2019 00:29",
 		"mouseDown:" : "ls 6/19/2019 21:57",
 		"paragraph:" : "MB 5/9/2019 09:42",
 		"returnValue" : "ls 6/19/2019 19:14",
 		"spaceValue" : "ls 6/19/2019 19:14",
-		"storeSelectionInParagraph" : "" } }
+		"t" : " 6/20/2019 13:17:31" } }
diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/instance/addColor.st
@@ -3,5 +3,5 @@ addColor
 	self currentStructure
 		ifNotNil: [(NewColorPickerMorph
 				on: self
-				originalColor: self class defaultColor
+				originalColor: (self richTextEditor findRealStructure: self currentStructure) color
 				setColorSelector: #setColor:) openInWorld]
diff --git a/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json b/packages/RichTextEditing-Core.package/RichTextStructureEditor.class/methodProperties.json
@@ -3,7 +3,7 @@
 		"defaultColor" : "",
 		"openWith:" : "MB 6/10/2019 18:21" },
 	"instance" : {
-		"addColor" : "",
+		"addColor" : "AG 6/20/2019 13:16",
 		"addNewStructure" : "lh 5/30/2019 10:50",
 		"buildAddStructureButtonWith:" : "lh 5/29/2019 18:54",
 		"buildColorButtonWith:" : "lh 6/19/2019 19:28",