aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/client/util/CurrentUserUtils.ts14
-rw-r--r--src/client/views/MainView.tsx2
-rw-r--r--src/client/views/nodes/button/FontIconBox.scss15
-rw-r--r--src/client/views/nodes/button/FontIconBox.tsx32
4 files changed, 40 insertions, 23 deletions
diff --git a/src/client/util/CurrentUserUtils.ts b/src/client/util/CurrentUserUtils.ts
index 8044f59f0..20274672a 100644
--- a/src/client/util/CurrentUserUtils.ts
+++ b/src/client/util/CurrentUserUtils.ts
@@ -967,11 +967,11 @@ export class CurrentUserUtils {
static inkTools(doc: Doc) {
const tools:Button[] = [
- { title: "Pen", toolTip: "Pen (Ctrl+P)", btnType: ButtonType.ToggleButton, icon: "pen", click: 'setActiveInkTool("pen")'},
- { title: "Highlighter", toolTip: "Highlighter (Ctrl+H)", btnType: ButtonType.ToggleButton, icon: "highlighter", click: 'setActiveInkTool("highlighter")' },
- { title: "Circle", toolTip: "Circle (Ctrl+Shift+C)", btnType: ButtonType.ToggleButton, icon: "circle", click: 'setActiveInkTool("circle")' },
- { title: "Square", toolTip: "Square (Ctrl+Shift+S)", btnType: ButtonType.ToggleButton, icon: "square", click: 'setActiveInkTool("square")' },
- { title: "Line", toolTip: "Line (Ctrl+Shift+L)", btnType: ButtonType.ToggleButton, icon: "fill-drip", click: 'setActiveInkTool("line")' },
+ { title: "Pen", toolTip: "Pen (Ctrl+P)", btnType: ButtonType.ToggleButton, icon: "pen", click: 'setActiveInkTool("pen")', script: 'setActiveInkTool("pen" , true)'},
+ { title: "Highlighter", toolTip: "Highlighter (Ctrl+H)", btnType: ButtonType.ToggleButton, icon: "highlighter", click: 'setActiveInkTool("highlighter")', script:'setActiveInkTool("highlighter", true)' },
+ { title: "Circle", toolTip: "Circle (Ctrl+Shift+C)", btnType: ButtonType.ToggleButton, icon: "circle", click: 'setActiveInkTool("circle")', script: 'setActiveInkTool("circle" , true)' },
+ { title: "Square", toolTip: "Square (Ctrl+Shift+S)", btnType: ButtonType.ToggleButton, icon: "square", click: 'setActiveInkTool("square")', script: 'setActiveInkTool("square" , true)' },
+ { title: "Line", toolTip: "Line (Ctrl+Shift+L)", btnType: ButtonType.ToggleButton, icon: "fill-drip", click: 'setActiveInkTool("line")', script: 'setActiveInkTool("line" , true)' },
{ title: "Stroke width", toolTip: "Stroke width", btnType: ButtonType.NumberButton, numBtnType: NumButtonType.Slider, ignoreClick: true, script: 'setStrokeWidth'},
];
return tools;
@@ -987,7 +987,7 @@ export class CurrentUserUtils {
width: 50,
switchToggle: true,
icon: "eye",
- click: 'toggleSchemaShow()',
+ ignoreClick: true,
script: 'toggleSchemaShow'
},
];
@@ -1071,6 +1071,7 @@ export class CurrentUserUtils {
ignoreClick: ignoreClick,
_stayInCollection: true,
_hideContextMenu: true,
+ _lockedPosition: true,
system: true,
dontUndo: true,
title,
@@ -1097,6 +1098,7 @@ export class CurrentUserUtils {
ignoreClick: ignoreClick,
_stayInCollection: true,
_hideContextMenu: true,
+ _lockedPosition: true,
system: true,
dontUndo: true,
title,
diff --git a/src/client/views/MainView.tsx b/src/client/views/MainView.tsx
index 5c1408148..75c57909d 100644
--- a/src/client/views/MainView.tsx
+++ b/src/client/views/MainView.tsx
@@ -331,7 +331,7 @@ export class MainView extends React.Component {
PanelHeight={this.getContentsHeight}
renderDepth={0}
isContentActive={returnTrue}
- scriptContext={CollectionDockingView.Instance.props.Document}
+ scriptContext={CollectionDockingView.Instance?.props.Document}
focus={DocUtils.DefaultFocus}
whenChildContentsActiveChanged={emptyFunction}
bringToFront={emptyFunction}
diff --git a/src/client/views/nodes/button/FontIconBox.scss b/src/client/views/nodes/button/FontIconBox.scss
index 7a6887d38..dfb549b95 100644
--- a/src/client/views/nodes/button/FontIconBox.scss
+++ b/src/client/views/nodes/button/FontIconBox.scss
@@ -240,7 +240,9 @@
flex-direction: column;
background: transparent;
- .numberBtn-slider {}
+ .menu-slider {
+ width: 100px;
+ }
.menuButton-dropdownBox {
position: absolute;
@@ -255,20 +257,20 @@
}
.button {
- width: 30%;
+ width: 25%;
display: flex;
align-items: center;
justify-content: center;
&.number {
- width: 40%;
+ width: 50%;
.button-input {
background: none;
border: none;
text-align: right;
width: 100%;
- color: black;
+ color: $white;
height: 100%;
text-align: center;
}
@@ -288,9 +290,9 @@
position: absolute;
width: fit-content;
height: fit-content;
- min-width: 50px;
+ min-width: 50%;
max-height: 50vh;
- overflow: scroll;
+ overflow-y: scroll;
top: 100%;
z-index: 21;
background-color: $white;
@@ -323,7 +325,6 @@
&:hover {
background-color: $close-red;
}
-
}
&.drpDownBtn {
diff --git a/src/client/views/nodes/button/FontIconBox.tsx b/src/client/views/nodes/button/FontIconBox.tsx
index 4778c2f10..744064b9f 100644
--- a/src/client/views/nodes/button/FontIconBox.tsx
+++ b/src/client/views/nodes/button/FontIconBox.tsx
@@ -25,6 +25,7 @@ import { StyleProp } from '../../StyleProvider';
import { FieldView, FieldViewProps } from '.././FieldView';
import { RichTextMenu } from '../formattedText/RichTextMenu';
import './FontIconBox.scss';
+import { SetActiveInkWidth } from '../../InkingStroke';
const FontIconSchema = createSchema({
icon: "string",
});
@@ -177,7 +178,7 @@ export class FontIconBox extends DocComponent<ButtonProps, FontIconDocument>(Fon
{this.rootDoc.dropDownOpen ?
<div>
<div className="menuButton-dropdownList"
- style={{ left: 0 }}>
+ style={{ left: "25%" }}>
{list}
</div>
<div className="dropbox-background" onClick={(e) => { e.stopPropagation(); this.rootDoc.dropDownOpen = false; }} />
@@ -383,12 +384,19 @@ export class FontIconBox extends DocComponent<ButtonProps, FontIconDocument>(Fon
const switchToggle: boolean = BoolCast(this.rootDoc.switchToggle);
// Script for running the toggle
- const script: string = StrCast(this.rootDoc.script) + "()";
+ const script: string = StrCast(this.rootDoc.script);
+
// Script for checking the outcome of the toggle
- const checkScript: string = StrCast(this.rootDoc.script) + "(true)";
+ let checkScript:string;
+ if (StrCast(this.rootDoc.script).includes("(")){
+ checkScript = StrCast(this.rootDoc.script)
+
+ } else {
+ checkScript = StrCast(this.rootDoc.script) + "(true)";
+ }
// Function to run the script
- const runScript = () => ScriptField.MakeScript(script)?.script.run();
+ const runScript = () => ScriptField.MakeScript(script + "()")?.script.run();
const checkResult = ScriptField.MakeScript(checkScript)?.script.run().result;
// Colors
@@ -456,9 +464,10 @@ export class FontIconBox extends DocComponent<ButtonProps, FontIconDocument>(Fon
return (
<div className={`menuButton ${this.type}`}>
- <FontAwesomeIcon className={`fontIconBox-icon-${this.type}`} icon={"lock"} />
+ HELLO
+ {/* <FontAwesomeIcon className={`fontIconBox-icon-${this.type}`} icon={"lock"} />
<EditableView GetValue={() => ""} SetValue={setValue} contents="...">
- </EditableView>
+ </EditableView> */}
</div>
);
}
@@ -492,6 +501,7 @@ export class FontIconBox extends DocComponent<ButtonProps, FontIconDocument>(Fon
switch (this.type) {
case ButtonType.EditableText:
+ console.log("Editable text");
button = this.editableText;
case ButtonType.NumberButton:
button = this.numberButton;
@@ -657,7 +667,11 @@ Scripting.addGlobal(function setActiveInkTool(tool: InkTool, checkResult?: boole
return Doc.UserDoc().activeInkTool === tool;
}
if (tool) {
- Doc.UserDoc().activeInkTool = tool;
+ if (Doc.UserDoc().activeInkTool === tool){
+ Doc.UserDoc().activeInkTool = InkTool.None;
+ } else {
+ Doc.UserDoc().activeInkTool = tool;
+ }
} else {
Doc.UserDoc().activeInkTool = InkTool.None;
}
@@ -668,6 +682,6 @@ Scripting.addGlobal(function setStrokeWidth(width: number, checkResult?: boolean
const width: number = NumCast(Doc.UserDoc().activeInkWidth);
return width;
}
- console.log("[width]: " + width);
- Doc.UserDoc().activeInkWidth = width;
+ SetActiveInkWidth(StrCast(width));
+ SelectionManager.Views().filter(i => StrCast(i.rootDoc.type) === DocumentType.INK).map(i => i.rootDoc.strokeWidth = Number(width));
}); \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-10-08 17:38:37 +0000