Skip to content

Commit

Permalink
- fixed textMargins
Browse files Browse the repository at this point in the history 
- Bug fixed: Setting Keyframes in Property Color
- added functionality of showing the timeline by clicking on PropertyRoot of a Morph (Title of Morph)
  • Loading branch information
@nick-bessin
nick-bessin committed Jul 4, 2021
1 parent c2e7f4f commit 2d33aca
Show file tree
Hide file tree
Showing 17 changed files with 30 additions and 25 deletions.
7 changes: 4 additions & 3 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ selectedTreeNode: aNode
selectedTreeNode := aNode.
aNode canRenderUI
ifTrue: [self insertMorph: (aNode buildUIWith: self toolBuilder)
Into: self propertyEditorPanel.
self switchTimelineToMorphWith: aNode.
].
Into: self propertyEditorPanel.
].
(aNode isKindOf: AnimationsEditorProperty)
ifTrue: [self switchTimelineToMorphWith: aNode].
6 changes: 3 additions & 3 deletions packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"addRotationFrameAt:with:" : "MH 6/5/2021 08:48",
"addSelectedMorphFor:" : "DM 8/5/2020 21:11",
"addSizeFrameAt:with:" : "MH 6/5/2021 08:48",
"addTargetMorph:" : "CL 6/25/2021 14:59",
"addTargetMorph:" : "NB 7/4/2021 13:45",
"buildAddKeyframeButtonWith:" : "CL 7/2/2021 10:51",
"buildAddMorphButtonWith:" : "CL 5/9/2021 14:08",
"buildButtonBarWith:" : "CL 5/30/2021 14:03",
Expand Down Expand Up @@ -87,8 +87,8 @@
"seedProperties" : "DM 8/5/2020 19:54",
"selectMorphByHand" : "DM 8/5/2020 20:07",
"selectedTreeNode" : "JIZ 5/27/2020 15:31",
"selectedTreeNode:" : "CL 7/2/2021 11:24",
"switchTimelineToMorphWith:" : "MH 7/1/2021 10:33",
"selectedTreeNode:" : "NB 7/4/2021 14:09",
"switchTimelineToMorphWith:" : "NB 7/4/2021 14:02",
"timeline" : "CL 6/25/2021 13:51",
"timeline:" : "CL 6/25/2021 13:51",
"timelines" : "DM 8/6/2020 10:31",
Expand Down
2 changes: 1 addition & 1 deletion ...ges/AnimationsEditor-Core.package/AnimationsEditorColorPicker.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
},
"instance" : {
"initialize" : "MH 6/2/2021 16:34",
"updateTargetColor" : "MH 6/2/2021 16:35" } }
"updateTargetColor" : "NB 7/4/2021 14:32" } }
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"buildInputFrameWith:" : "mjs 6/11/2021 15:45",
"buildUIWith:" : "JIZ 6/3/2020 16:35",
"canCreateAnimation" : "DM 8/6/2020 10:26",
"canRenderUI" : "DM 8/5/2020 21:06",
"canRenderUI" : "NB 7/4/2021 13:59",
"copyOfTargetMorph" : "DM 8/6/2020 10:33",
"copyOfTargetMorph:" : "DM 7/8/2020 13:45",
"createAnimationFor:withKey:withLastKey:withValue:withLastValue:" : "mjs 6/11/2021 15:36",
Expand Down
4 changes: 2 additions & 2 deletions ...s/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"targetColor:" : "LW 5/15/2021 13:57",
"targetColorAsHexRGBString" : "MH 6/3/2021 17:12",
"targetColorAsString" : "mjs 5/21/2021 11:48",
"targetColorFromString:" : "MH 6/3/2021 17:17",
"update:" : "MH 6/3/2021 16:12" } }
"targetColorFromString:" : "NB 7/4/2021 14:40",
"update:" : "NB 7/4/2021 14:30" } }
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ initialization
initialize

super initialize.
self color: Color white.
self color: Color lightGray.
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"addIntermediateLines" : "MH 7/1/2021 12:08",
"addLineFrom:to:" : "MH 7/1/2021 10:19",
"addStartEndLine" : "MH 7/1/2021 12:07",
"initialize" : "MH 7/1/2021 09:48",
"initialize" : "NB 7/4/2021 15:15",
"lineHeight" : "MH 7/1/2021 12:06",
"startEndLineHeight" : "MH 7/1/2021 12:06",
"updateScale" : "MH 7/1/2021 12:08" } }
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ initialize
super initialize.

self extent: self initialExtent.
self color: Color white.
self color: Color lightGray.
self initializeStartEndTime.
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"endTime" : "MH 7/1/2021 09:50",
"endTime:" : "MH 7/1/2021 09:50",
"initialExtent" : "MH 7/1/2021 10:48",
"initialize" : "MH 7/1/2021 10:52",
"initialize" : "NB 7/4/2021 15:15",
"initializeStartEndTime" : "MH 7/1/2021 10:41",
"property" : "CL 6/25/2021 15:49",
"property:" : "CL 6/25/2021 15:49",
Expand Down
2 changes: 1 addition & 1 deletion ...nimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/startMargin.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
startMargin

^ 85.
^ 105.
2 changes: 1 addition & 1 deletion .../AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"convertFrameToPosition:" : "CL 7/2/2021 12:12",
"endMargin" : "CL 7/2/2021 12:14",
"lineSegmentWidth" : "CL 7/2/2021 12:13",
"startMargin" : "CL 7/2/2021 12:14",
"startMargin" : "NB 7/4/2021 15:11",
"timeline" : "CL 7/2/2021 12:12",
"timeline:" : "CL 7/2/2021 12:12" } }
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ initialization
initialize

super initialize.
self color: Color white.
self color: Color lightGray.



Expand Down
1 change: 1 addition & 0 deletions ...ges/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeMorph.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ initializeMorph
panel := RectangleMorph new.
panel
position: self textMargin @ self position y;
color: Color darkGray;
extent: self width - self textMargin @ self height.
self addMorph: panel.
3 changes: 2 additions & 1 deletion ...ages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeText.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ initializeText

text := StringMorph new
contents: self property title;
font: (StrikeFont familyName: 'Arial' pointSize: 9);
yourself.
text center: ((text width/2)+10 @ (self center y)).
text center: ((text width/2)+5 @ (self center y)).
self addMorph: text.
2 changes: 1 addition & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/textMargin.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
constants
textMargin

^ 75.
^ 95.
4 changes: 3 additions & 1 deletion packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/update..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ initialization
update: aProperty

self property: aProperty.
self addKeyframes.
(self property isKindOf: AnimationsEditorProperty)
ifTrue: [self addKeyframes].

10 changes: 5 additions & 5 deletions packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"on:withProperty:withPosition:withExtent:" : "CL 6/25/2021 16:21" },
"instance" : {
"addKeyframes" : "CL 7/2/2021 12:03",
"initialize" : "CL 6/25/2021 16:22",
"initializeMorph" : "MH 7/1/2021 12:16",
"initializeText" : "MH 7/1/2021 11:34",
"initialize" : "NB 7/4/2021 15:14",
"initializeMorph" : "NB 7/4/2021 15:13",
"initializeText" : "NB 7/4/2021 15:10",
"initializeTrack" : "CL 7/2/2021 10:39",
"keyframeMargin" : "CL 7/2/2021 12:19",
"property" : "CL 6/25/2021 15:36",
"property:" : "CL 6/25/2021 15:36",
"textMargin" : "MH 7/1/2021 12:16",
"update:" : "CL 7/2/2021 11:02" } }
"textMargin" : "NB 7/4/2021 15:11",
"update:" : "NB 7/4/2021 14:50" } }

0 comments on commit 2d33aca

Please sign in to comment.