From 51284f9a1dd0b820602756eae5b93a8939583fe9 Mon Sep 17 00:00:00 2001
From: Jan Bliznicenko <jan.bliznicenko@fit.cvut.cz>
Date: Sun, 15 Oct 2023 19:01:47 +0200
Subject: [PATCH] reworked coloring

---
 .../OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st       | 4 ++--
 .../OpenPonk-ClassEditor/OPUmlClassifierShape.class.st      | 6 +++---
 repository/OpenPonk-ClassEditor/OPUmlPackageShape.class.st  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st b/repository/OpenPonk-ClassEditor/OPUmlClassItemLabel.class.st
index 373c0bc2..7166f984 100644
--- 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
index 9106d0fd..b1bb58c4 100644
--- 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
index 2c4209bf..382f3be9 100644
--- 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
 ]