Skip to content

Commit

Permalink
fix bug: remove label from card
Browse files Browse the repository at this point in the history
  • Loading branch information
Matthias Cram committed Jun 7, 2022
1 parent b649a7c commit c6a7214
Show file tree
Hide file tree
Showing 15 changed files with 34 additions and 27 deletions.
1 change: 0 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/buildAddLaneButtonPanelSpecWith..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ buildAddLaneButtonPanelSpecWith: aBuilder

^ aBuilder pluggablePanelSpec new
minimumExtent: (300@2000);
color: (Color blue);
children: {self buildAddLaneButtonSpecWith: aBuilder};
yourself.
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBBoard.class/instance/buildAddLaneButtonSpecWith..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ toolbuilder
buildAddLaneButtonSpecWith: aBuilder

^ aBuilder pluggableActionButtonSpec new
frame: (0@0 corner: 1@0.1);
frame: (0@0 corner: 1@0.05);
model: self;
action: #addLane;
label: '+ Add lane';
Expand Down
9 changes: 4 additions & 5 deletions Squello-Core.package/SPBBoard.class/instance/buildLaneAreaChildren.st
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
toolbuilder
buildLaneAreaChildren

| children |

children := ((self buildLanesSpecWith: self usedBuilder) collect:
| children |
children := ((self buildLanesSpecWith: self usedBuilder) collect:
[:spec | self usedBuilder build: spec]) asOrderedCollection.
children add: ((self usedBuilder build: (self buildAddLaneButtonPanelSpecWith: self usedBuilder)) color: Color darkGray).
children add: ((self usedBuilder build: (self buildAddLaneButtonPanelSpecWith: self usedBuilder)) color: (Color lightGray)).

^ children
^ children.
1 change: 0 additions & 1 deletion Squello-Core.package/SPBBoard.class/instance/showLanes.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ drag and drop
showLanes

self lanes do: [:each | each pasteup: (self usedBuilder widgetAt: each id).
"Transcript show: each jsonCards; cr; cr."
each buildCards.
each board: self].
8 changes: 4 additions & 4 deletions Squello-Core.package/SPBBoard.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
"addLane" : "NTK 6/6/2022 13:45",
"assigneeSelected" : "mcr 5/27/2022 19:11",
"assigneeSelected:" : "mcr 5/27/2022 19:13",
"buildAddLaneButtonPanelSpecWith:" : "NTK 6/6/2022 13:33",
"buildAddLaneButtonSpecWith:" : "NTK 6/6/2022 13:29",
"buildAddLaneButtonPanelSpecWith:" : "mcr 6/6/2022 22:41",
"buildAddLaneButtonSpecWith:" : "mcr 6/6/2022 22:30",
"buildAndOpen" : "NTK 6/1/2022 16:47",
"buildLaneAreaChildren" : "NTK 6/6/2022 13:40",
"buildLaneAreaChildren" : "mcr 6/6/2022 22:42",
"buildLaneAreaSpecWith:" : "NTK 6/6/2022 13:07",
"buildLaneBodySpecWith:And:" : "mcr 5/28/2022 02:45",
"buildLaneHeaderAddCardButtonSpecWith:And:" : "mcr 5/27/2022 18:58",
Expand Down Expand Up @@ -68,7 +68,7 @@
"potentialLabelsList" : "lo 6/5/2022 14:57",
"provider" : "lo 5/26/2022 22:23",
"provider:" : "lo 5/26/2022 22:24",
"showLanes" : "NTK 6/6/2022 12:35",
"showLanes" : "mcr 6/6/2022 22:40",
"synchronizeBoard" : "NTK 6/6/2022 12:52",
"updateActiveCardDescription:" : "lo 5/26/2022 14:35",
"updateActiveCardTitle:" : "lo 5/26/2022 14:35",
Expand Down
4 changes: 4 additions & 0 deletions Squello-Core.package/SPBCard.class/instance/labelMorphs..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
accessing
labelMorphs: aCollection

labelMorphs := aCollection.
5 changes: 5 additions & 0 deletions Squello-Core.package/SPBCard.class/instance/labelMorphs.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
accessing
labelMorphs

labelMorphs ifNil: [self labelMorphs: (Set newFrom: {})].
^ labelMorphs.
3 changes: 3 additions & 0 deletions Squello-Core.package/SPBCard.class/instance/updateLabelIcons.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ updating
updateLabelIcons

| newLabel |
self labelMorphs do: [:each | each abandon].
self labels withIndexDo: [:label :i |
newLabel := label asForm asMorph.
newLabel balloonText: label title.
self labelMorphs add: newLabel.
self addMorph: newLabel.
newLabel position: ((newLabel extent x + 1 * i) + 5 @ self extent y - newLabel extent y - 5) + self position].
8 changes: 5 additions & 3 deletions Squello-Core.package/SPBCard.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,14 @@
"extent" : "lo 6/6/2022 13:08",
"frontCardId" : "LW 5/24/2022 21:51",
"frontCardId:" : "LW 5/24/2022 21:51",
"handlesMouseDown:" : "lo 5/27/2022 00:03",
"handlesMouseDown:" : "mcr 6/6/2022 22:17",
"id" : "mcr 5/27/2022 18:41",
"id:" : "mcr 5/27/2022 18:41",
"initialize" : "lo 6/6/2022 13:08",
"issueId" : "LW 5/24/2022 21:51",
"issueId:" : "mcr 5/27/2022 18:45",
"labelMorphs" : "mcr 6/7/2022 15:41",
"labelMorphs:" : "mcr 6/7/2022 15:36",
"labels" : "lo 6/5/2022 14:39",
"labels:" : "lo 6/5/2022 14:39",
"lane" : "mcr 5/21/2022 20:50",
Expand All @@ -33,9 +35,9 @@
"updateAssigneeCount" : "mcr 5/30/2022 23:39",
"updateBalloonText" : "mcr 5/30/2022 23:42",
"updateDescription:" : "mcr 5/21/2022 19:53",
"updateLabelIcons" : "lo 6/6/2022 13:11",
"updateLabelIcons" : "mcr 6/7/2022 15:39",
"updateTitle:" : "mcr 5/30/2022 21:43",
"user" : "mcr 5/21/2022 20:52",
"user:" : "mcr 5/21/2022 20:52",
"walkToPosition:" : "NTK 6/6/2022 13:46",
"yellowButtonActivity:" : "lo 5/27/2022 00:33" } }
"yellowButtonActivity:" : "mcr 6/6/2022 22:16" } }
3 changes: 2 additions & 1 deletion Squello-Core.package/SPBCard.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
"assignees",
"labels",
"titleMorph",
"assigneeMorph" ],
"assigneeMorph",
"labelMorphs" ],
"name" : "SPBCard",
"pools" : [
],
Expand Down
2 changes: 1 addition & 1 deletion Squello-Core.package/SPBLabel.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"newFrom:" : "lo 6/6/2022 12:25" },
"instance" : {
"=" : "lo 6/5/2022 14:59",
"asForm" : "lo 6/6/2022 12:19",
"asForm" : "mcr 6/6/2022 13:51",
"asString" : "lo 6/5/2022 14:49",
"color" : "lo 5/16/2022 22:01",
"color:" : "lo 5/23/2022 16:52",
Expand Down
5 changes: 0 additions & 5 deletions Squello-Core.package/SPBLane.class/instance/changeLaneLocalFor.in..st
View file

This file was deleted.

3 changes: 2 additions & 1 deletion Squello-Core.package/SPBLane.class/instance/moveIn..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ moveIn: aSPBCard
self reorderCards: aSPBCard.
self changeLaneRemoteFor: aSPBCard.
aSPBCard lane = self ifTrue: [self alignCards. ^ self].
self changeLaneLocalFor: aSPBCard in: aSPBCard lane.
aSPBCard lane alignCards.
self alignCards.
aSPBCard lane: self.

2 changes: 1 addition & 1 deletion Squello-Core.package/SPBLane.class/instance/removeFromOldLane..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ removeFromOldLane: aSPBCard

(cards last = aSPBCard or: [cards first = aSPBCard]) ifFalse:
[( cards at: index + 1) frontCardId: (cards at: index - 1) id].
(cards size ~~ 1 and: [cards first = aSPBCard]) ifTrue:
(cards size > 1 and: [cards first = aSPBCard]) ifTrue:
[( cards at: index + 1) frontCardId: nil].
cards remove: aSPBCard.
5 changes: 2 additions & 3 deletions Squello-Core.package/SPBLane.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,18 @@
"cardDropped:Event:" : "mcr 6/3/2022 13:03",
"cards" : "lo 5/26/2022 22:44",
"cards:" : "lo 5/26/2022 22:44",
"changeLaneLocalFor:in:" : "mcr 6/3/2022 12:29",
"changeLaneRemoteFor:" : "mcr 6/3/2022 13:14",
"fetchCards" : "NTK 6/6/2022 01:57",
"id" : "tkv 5/21/2022 00:59",
"id:" : "jh 6/3/2022 20:41",
"jsonCards" : "NTK 6/6/2022 01:27",
"jsonCards:" : "NTK 6/6/2022 01:27",
"moveIn:" : "mcr 6/3/2022 12:36",
"moveIn:" : "mcr 6/4/2022 13:17",
"pasteup" : "lo 5/26/2022 23:18",
"pasteup:" : "lo 5/26/2022 23:30",
"provider" : "mcr 5/20/2022 11:56",
"provider:" : "mcr 5/20/2022 11:57",
"removeFromOldLane:" : "mcr 6/3/2022 12:31",
"removeFromOldLane:" : "mcr 6/4/2022 13:19",
"reorderCards:" : "mcr 6/3/2022 12:32",
"setFrontCardFor:in:" : "mcr 6/3/2022 11:35",
"title" : "mcr 5/20/2022 14:00",
Expand Down

0 comments on commit c6a7214

Please sign in to comment.