diff options
| author | andrewdkim <adkim414@gmail.com> | 2019-11-23 16:30:45 -0500 |
|---|---|---|
| committer | andrewdkim <adkim414@gmail.com> | 2019-11-23 16:30:45 -0500 |
| commit | b5b45c7d8eb9e3056c71d9ca213cca7f2d9c792a (patch) | |
| tree | e6a04ae7ea36d085607a90109e2698db8ac2e034 /src/client/views/nodes/ColorBox.tsx | |
| parent | 8af45ed7f376981ce8f8b1c6d1b2fd3b1546a00e (diff) | |
| parent | 3b37cc31bb09b11238868c34a38a8e99f508479f (diff) | |
merge from master
Diffstat (limited to 'src/client/views/nodes/ColorBox.tsx')
| -rw-r--r-- | src/client/views/nodes/ColorBox.tsx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/views/nodes/ColorBox.tsx b/src/client/views/nodes/ColorBox.tsx index fda6d64f4..40674b034 100644 --- a/src/client/views/nodes/ColorBox.tsx +++ b/src/client/views/nodes/ColorBox.tsx @@ -38,7 +38,9 @@ export class ColorBox extends DocExtendableComponent<FieldViewProps, ColorDocume render() { return <div className={`colorBox-container${this.active() ? "-interactive" : ""}`} - onPointerDown={e => e.button === 0 && !e.ctrlKey && e.stopPropagation()}> + onPointerDown={e => e.button === 0 && !e.ctrlKey && e.stopPropagation()} + style={{ transformOrigin: "top left", transform: `scale(${this.props.ContentScaling()})`, width: `${100 / this.props.ContentScaling()}%`, height: `${100 / this.props.ContentScaling()}%` }} > + <SketchPicker color={this._startupColor} onChange={InkingControl.Instance.switchColor} /> </div>; } |