From 2d33acaff16951a6bd4c17358c15be59ad2912ff Mon Sep 17 00:00:00 2001 From: Nick Bessin Date: Sun, 4 Jul 2021 15:28:45 +0200 Subject: [PATCH] - fixed textMargins - Bug fixed: Setting Keyframes in Property Color - added functionality of showing the timeline by clicking on PropertyRoot of a Morph (Title of Morph) --- .../instance/selectedTreeNode..st | 7 ++++--- .../AnimationsEditor.class/methodProperties.json | 6 +++--- .../methodProperties.json | 2 +- .../methodProperties.json | 2 +- .../methodProperties.json | 4 ++-- .../instance/initialize.st | 2 +- .../methodProperties.json | 2 +- .../instance/initialize.st | 2 +- .../methodProperties.json | 2 +- .../instance/startMargin.st | 2 +- .../methodProperties.json | 2 +- .../AnimationsEditorTrack.class/instance/initialize.st | 2 +- .../instance/initializeMorph.st | 1 + .../instance/initializeText.st | 3 ++- .../AnimationsEditorTrack.class/instance/textMargin.st | 2 +- .../AnimationsEditorTrack.class/instance/update..st | 4 +++- .../AnimationsEditorTrack.class/methodProperties.json | 10 +++++----- 17 files changed, 30 insertions(+), 25 deletions(-) diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st index 566f00e..7f8389d 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/instance/selectedTreeNode..st @@ -4,6 +4,7 @@ selectedTreeNode: aNode selectedTreeNode := aNode. aNode canRenderUI ifTrue: [self insertMorph: (aNode buildUIWith: self toolBuilder) - Into: self propertyEditorPanel. - self switchTimelineToMorphWith: aNode. - ]. \ No newline at end of file + Into: self propertyEditorPanel. + ]. + (aNode isKindOf: AnimationsEditorProperty) + ifTrue: [self switchTimelineToMorphWith: aNode]. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json index e54a090..068c01d 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditor.class/methodProperties.json @@ -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", @@ -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", diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorColorPicker.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorColorPicker.class/methodProperties.json index e9d1661..318a16a 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorColorPicker.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorColorPicker.class/methodProperties.json @@ -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" } } diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json index 645e8fe..17618a0 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorProperty.class/methodProperties.json @@ -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", diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json index 4b83d19..851c5c9 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorPropertyColor.class/methodProperties.json @@ -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" } } diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st index 78a5a99..5c374e0 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/instance/initialize.st @@ -2,4 +2,4 @@ initialization initialize super initialize. - self color: Color white. \ No newline at end of file + self color: Color lightGray. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json index d59c677..edb9a32 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimebar.class/methodProperties.json @@ -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" } } diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st index 0203ab5..2f54479 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/instance/initialize.st @@ -4,5 +4,5 @@ initialize super initialize. self extent: self initialExtent. - self color: Color white. + self color: Color lightGray. self initializeStartEndTime. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json index b5ec961..195061a 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimeline.class/methodProperties.json @@ -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", diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/startMargin.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/startMargin.st index bd4d3ac..7e68d92 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/startMargin.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/instance/startMargin.st @@ -1,4 +1,4 @@ constants startMargin - ^ 85. \ No newline at end of file + ^ 105. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json index ce66235..48bec37 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTimelineObject.class/methodProperties.json @@ -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" } } diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initialize.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initialize.st index 8c66138..1591326 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initialize.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initialize.st @@ -2,7 +2,7 @@ initialization initialize super initialize. - self color: Color white. + self color: Color lightGray. diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeMorph.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeMorph.st index f7a12e8..17c6ace 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeMorph.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeMorph.st @@ -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. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeText.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeText.st index 640f8fe..e4d040e 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeText.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/initializeText.st @@ -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. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/textMargin.st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/textMargin.st index 84afb37..83ce5dc 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/textMargin.st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/textMargin.st @@ -1,4 +1,4 @@ constants textMargin - ^ 75. \ No newline at end of file + ^ 95. \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/update..st b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/update..st index 27da226..0854981 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/update..st +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/instance/update..st @@ -2,4 +2,6 @@ initialization update: aProperty self property: aProperty. - self addKeyframes. \ No newline at end of file + (self property isKindOf: AnimationsEditorProperty) + ifTrue: [self addKeyframes]. + \ No newline at end of file diff --git a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json index dfde3ba..62cb2a2 100644 --- a/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json +++ b/packages/AnimationsEditor-Core.package/AnimationsEditorTrack.class/methodProperties.json @@ -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" } }