aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandrewdkim <adkim414@gmail.com>2019-09-24 16:50:23 -0400
committerandrewdkim <adkim414@gmail.com>2019-09-24 16:50:23 -0400
commitbf8907cfc3e005f2ce6756820d9b3f9de35f1807 (patch)
treeac91da87a1ca51551535b817d5adc5bb681b6cf5
parent1307760412379a07b02f9148311bd9d22ed758b8 (diff)
brushing
-rw-r--r--src/client/views/animationtimeline/Keyframe.tsx3
-rw-r--r--src/client/views/animationtimeline/Timeline.tsx2
-rw-r--r--src/client/views/animationtimeline/Track.tsx2
3 files changed, 4 insertions, 3 deletions
diff --git a/src/client/views/animationtimeline/Keyframe.tsx b/src/client/views/animationtimeline/Keyframe.tsx
index 7197f4b49..9728c2462 100644
--- a/src/client/views/animationtimeline/Keyframe.tsx
+++ b/src/client/views/animationtimeline/Keyframe.tsx
@@ -532,6 +532,7 @@ export class Keyframe extends React.Component<IProps> {
e.stopPropagation();
let div = ref.current!;
div.style.opacity = "1";
+ Doc.BrushDoc(this.props.node);
}
onContainerOut = (e: React.PointerEvent, ref: React.RefObject<HTMLDivElement>) => {
@@ -539,6 +540,7 @@ export class Keyframe extends React.Component<IProps> {
e.stopPropagation();
let div = ref.current!;
div.style.opacity = "0";
+ Doc.UnBrushDoc(this.props.node);
}
@@ -623,7 +625,6 @@ export class Keyframe extends React.Component<IProps> {
}
}
render() {
- console.log("RERENDERING");
return (
<div>
<div className="bar" ref={this._bar} style={{ transform: `translate(${this.pixelPosition}px)`,
diff --git a/src/client/views/animationtimeline/Timeline.tsx b/src/client/views/animationtimeline/Timeline.tsx
index c50ffa51b..875a0b8f3 100644
--- a/src/client/views/animationtimeline/Timeline.tsx
+++ b/src/client/views/animationtimeline/Timeline.tsx
@@ -423,7 +423,7 @@ export class Timeline extends React.Component<FieldViewProps> {
</div>
</div>
<div key="timeline_title"className="title-container" ref={this._titleContainer}>
- {DocListCast(this.children).map(doc => <div className="datapane"><p>{doc.title}</p></div>)}
+ {DocListCast(this.children).map(doc => <div className="datapane" onPointerOver={() => {Doc.BrushDoc(doc);}} onPointerOut={() => {Doc.UnBrushDoc(doc);}}><p>{doc.title}</p></div>)}
</div>
<div key="timeline_resize" onPointerDown={this.onResizeDown}>
<FontAwesomeIcon className="resize" icon={faGripLines} />
diff --git a/src/client/views/animationtimeline/Track.tsx b/src/client/views/animationtimeline/Track.tsx
index c68d9bb3a..274b215d9 100644
--- a/src/client/views/animationtimeline/Track.tsx
+++ b/src/client/views/animationtimeline/Track.tsx
@@ -294,7 +294,7 @@ export class Track extends React.Component<IProps> {
return (
<div className="track-container">
<div className="track">
- <div className="inner" ref={this._inner} onDoubleClick={this.onInnerDoubleClick}>
+ <div className="inner" ref={this._inner} onDoubleClick={this.onInnerDoubleClick} onPointerOver = {() => {Doc.BrushDoc(this.props.node);}}onPointerOut={() => {Doc.UnBrushDoc(this.props.node);}}>
{DocListCast(this.regions).map((region) => {
return <Keyframe {...this.props} RegionData={region} />;
})}