reworked coloring

OpenPonk · Oct 15, 2023 · 51284f9 · 51284f9
1 parent 7b7cd51
commit 51284f9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #OPUmlClassItemLabel,
 	#superclass : #OPUmlClassifierItemLabel,
-	#traits : 'OPTDIColoredAsStroke',
-	#classTraits : 'OPTDIColoredAsStroke classTrait',
+	#traits : 'OPTDIColoredAsFont',
+	#classTraits : 'OPTDIColoredAsFont classTrait',
 	#category : #'OpenPonk-ClassEditor-DiagramElements'
 }
 

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassifierShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassifierShape.class.st
@@ -1,8 +1,8 @@
 Class {
 	#name : #OPUmlClassifierShape,
 	#superclass : #OPUmlCompartmentableShape,
-	#traits : 'OPTDIBorderColoredAsStroke + OPTDIColoredAsFill',
-	#classTraits : 'OPTDIBorderColoredAsStroke classTrait + OPTDIColoredAsFill classTrait',
+	#traits : 'OPTDIColoredAsFill',
+	#classTraits : 'OPTDIColoredAsFill classTrait',
 	#instVars : [
 		'nameLabel',
 		'stereotypeLabel',
@@ -130,7 +130,7 @@ OPUmlClassifierShape >> updateRenderFromStyles [
 
 	self isRendered ifFalse: [ ^ self ].
 	roassalShape color: self fillColor.
-	roassalShape borderColor: self strokeColor.
+	roassalShape borderColor: Color black.
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]

diff --git a/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st b/repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st
@@ -63,7 +63,7 @@ OPUmlPackageShape >> renderBasicShape [
 	^ RSBox new
 		  width: self minWidth;
 		  height: self minHeight;
-		  color: self color;
+		  color: self fillColor;
 		  borderColor: Color black;
 		  yourself
 ]
@@ -165,8 +165,8 @@ OPUmlPackageShape >> updateRenderFromModel [
 OPUmlPackageShape >> updateRenderFromStyles [
 
 	self isRendered ifFalse: [ ^ self ].
-	roassalShape color: self color.
-	ear color: self color.
+	roassalShape color: self fillColor.
+	ear color: self fillColor.
 	super updateRenderFromStyles.
 	self roassalShape signalUpdate
 ]