Merge FeatureThemes into master

hpi-swa-teaching · Jun 22, 2024 · 37c2e1b · 37c2e1b
2 parents fdbb3e1 + 401231b
commit 37c2e1b
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 15 deletions.
diff --git a/Squello-Core.package/SPBLabel.class/instance/asMorph.st b/Squello-Core.package/SPBLabel.class/instance/asMorph.st
@@ -1,10 +1,4 @@
 converting
 asMorph
 
-	^ SPBLabelMorph new
-		backgroundColor: self color;
-		color: self color makeForegroundColor;
-		contents: self title;
-		extent: 100@21;
-		lock;
-		yourself.
+	^ SPBLabelMorph createFromLabel: self.
diff --git a/Squello-Core.package/SPBLabel.class/methodProperties.json b/Squello-Core.package/SPBLabel.class/methodProperties.json
@@ -5,7 +5,7 @@
 	"instance" : {
 		"=" : "jh 7/31/2022 13:05",
 		"asForm" : "tk 8/2/2022 23:37",
-		"asMorph" : "AH 6/20/2024 23:57",
+		"asMorph" : "AH 6/22/2024 15:56",
 		"asString" : "lo 6/5/2022 14:49",
 		"color" : "lo 5/16/2022 22:01",
 		"color:" : "lo 5/23/2022 16:52",

diff --git a/Squello-Core.package/SPBLabelMorph.class/class/createFromLabel..st b/Squello-Core.package/SPBLabelMorph.class/class/createFromLabel..st
@@ -0,0 +1,9 @@
+instance creation
+createFromLabel: aLabel
+
+	^ SPBLabelMorph new
+		backgroundColor: aLabel color;
+		color: aLabel color makeForegroundColor;
+		contents: aLabel title;
+		lock;
+		yourself.
diff --git a/Squello-Core.package/SPBLabelMorph.class/instance/applyUserInterfaceTheme.st b/Squello-Core.package/SPBLabelMorph.class/instance/applyUserInterfaceTheme.st
@@ -1,4 +1,4 @@
-as yet unclassified
+initialization
 applyUserInterfaceTheme
 
 	super applyUserInterfaceTheme.

diff --git a/Squello-Core.package/SPBLabelMorph.class/instance/defaultCornerRadius.st b/Squello-Core.package/SPBLabelMorph.class/instance/defaultCornerRadius.st
@@ -0,0 +1,4 @@
+constants
+defaultCornerRadius
+
+	^ 8.
diff --git a/Squello-Core.package/SPBLabelMorph.class/instance/initialize.st b/Squello-Core.package/SPBLabelMorph.class/instance/initialize.st
@@ -1,8 +1,8 @@
-as yet unclassified
+initialization
 initialize
 
 	super initialize.
 	self cornerStyle: #rounded;
-		cornerRadius: 8;
-		margins: 4@2.
-	self applyUserInterfaceTheme.
+		cornerRadius: self defaultCornerRadius;
+		margins: self padding;
+		applyUserInterfaceTheme.
diff --git a/Squello-Core.package/SPBLabelMorph.class/instance/padding.st b/Squello-Core.package/SPBLabelMorph.class/instance/padding.st
@@ -0,0 +1,4 @@
+constants
+padding
+
+	^ 4 @ 2.
diff --git a/Squello-Core.package/SPBLabelMorph.class/methodProperties.json b/Squello-Core.package/SPBLabelMorph.class/methodProperties.json
@@ -1,6 +1,8 @@
 {
 	"class" : {
-		 },
+		"createFromLabel:" : "AH 6/22/2024 15:59" },
 	"instance" : {
 		"applyUserInterfaceTheme" : "AH 6/20/2024 23:12",
-		"initialize" : "AH 6/20/2024 23:06" } }
+		"defaultCornerRadius" : "AH 6/22/2024 16:02",
+		"initialize" : "AH 6/22/2024 16:02",
+		"padding" : "AH 6/22/2024 16:02" } }