From 15316764dfcc1d230efdc6cd2f2f0bd47be3efd8 Mon Sep 17 00:00:00 2001 From: anika-ahluwalia Date: Tue, 14 Apr 2020 18:32:27 -0500 Subject: add on finish button and change button drag out --- src/client/views/nodes/ScriptingBox.scss | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/client/views/nodes/ScriptingBox.scss') diff --git a/src/client/views/nodes/ScriptingBox.scss b/src/client/views/nodes/ScriptingBox.scss index 678a1a22d..3dfd65bc1 100644 --- a/src/client/views/nodes/ScriptingBox.scss +++ b/src/client/views/nodes/ScriptingBox.scss @@ -6,16 +6,20 @@ pointer-events: all; background-color: rgb(241, 239, 235); padding: 10px; + .scriptingBox-inputDiv { display: flex; flex-direction: column; height: calc(100% - 30px); + .scriptingBox-errorMessage { overflow: auto; } + .scripting-params { background: "beige"; } + .scriptingBox-textArea { width: 100%; height: 100%; @@ -28,9 +32,11 @@ .scriptingBox-toolbar { width: 100%; height: 30px; + .scriptingBox-button { - width: 50% + width: 33%; + resize: auto; + } } -} - +} \ No newline at end of file -- cgit v1.2.3-70-g09d2 From a261ab5e9697277bec029803f1fa0c890f0c8fd5 Mon Sep 17 00:00:00 2001 From: anika-ahluwalia Date: Sat, 18 Apr 2020 17:47:03 -0500 Subject: fix button UI on scripting, changed button onClick --- src/client/documents/Documents.ts | 12 ++++++------ src/client/views/nodes/ScriptingBox.scss | 2 +- src/client/views/nodes/ScriptingBox.tsx | 10 ++++++++-- 3 files changed, 15 insertions(+), 9 deletions(-) (limited to 'src/client/views/nodes/ScriptingBox.scss') diff --git a/src/client/documents/Documents.ts b/src/client/documents/Documents.ts index aea4867cd..450f342ca 100644 --- a/src/client/documents/Documents.ts +++ b/src/client/documents/Documents.ts @@ -648,12 +648,12 @@ export namespace Docs { } export function ButtonDocument(options?: DocumentOptions) { - const btn = InstanceFromProto(Prototypes.get(DocumentType.BUTTON), undefined, { ...(options || {}), "onClick-rawScript": "-script-" }); - btn.layoutKey = "layout_onClick"; - btn.height = 250; - btn.width = 200; - btn.layout_onClick = ScriptingBox.LayoutString("onClick"); - return btn; + // const btn = InstanceFromProto(Prototypes.get(DocumentType.BUTTON), undefined, { ...(options || {}), "onClick-rawScript": "-script-" }); + // btn.layoutKey = "layout_onClick"; + // btn.height = 250; + // btn.width = 200; + // btn.layout_onClick = ScriptingBox.LayoutString("onClick"); + return InstanceFromProto(Prototypes.get(DocumentType.BUTTON), undefined, { ...(options || {}), "onClick-rawScript": "-script-" }); } export function SliderDocument(options?: DocumentOptions) { diff --git a/src/client/views/nodes/ScriptingBox.scss b/src/client/views/nodes/ScriptingBox.scss index 3dfd65bc1..ffef1410d 100644 --- a/src/client/views/nodes/ScriptingBox.scss +++ b/src/client/views/nodes/ScriptingBox.scss @@ -34,7 +34,7 @@ height: 30px; .scriptingBox-button { - width: 33%; + width: 50%; resize: auto; } diff --git a/src/client/views/nodes/ScriptingBox.tsx b/src/client/views/nodes/ScriptingBox.tsx index bd20f9f67..317c48c1a 100644 --- a/src/client/views/nodes/ScriptingBox.tsx +++ b/src/client/views/nodes/ScriptingBox.tsx @@ -84,7 +84,9 @@ export class ScriptingBox extends ViewBoxAnnotatableComponent; return (
this.props.isSelected(true) && e.stopPropagation()}> +
this.props.isSelected(true) && e.stopPropagation()} >