Skip to content

[Custom Block Shape] Resize notches and reports upon registration #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Steve0Greatness wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[Custom Block Shape] Resize notches and reports upon registration #191

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 35 additions & 3 deletions src/addons/addons/custom-block-shape/userscript.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ export default async function ({ addon, console }) {
const ogFieldImageInit = BlocklyInstance.FieldImage.prototype.init;

const { GRID_UNIT } = BlockSvg;
const cached_scalers = {};

function path2SegmentList(path) {
const cmds = structuredClone(BlockSvg.CUSTOM_NOTCH_UTIL.supportedCommands);
Expand Down Expand Up @@ -82,6 +83,8 @@ export default async function ({ addon, console }) {
iconSize = addon.settings.get("iconSize")
) {
let multiplier = paddingSize / 100;
cached_scalers.multiplier = multiplier;
cached_scalers.notchSize = notchSize;
cornerSize = cornerSize / 100;
notchSize = notchSize / 100;
iconSize = iconSize / 100;
Expand Down Expand Up @@ -122,6 +125,7 @@ export default async function ({ addon, console }) {
/* Custom Notch API Support */
const adjustedNotchSize = (multiplier > 1 ? multiplier - 0.05 :
multiplier < 1 ? multiplier + 0.05 : multiplier) + ((cornerSize - 1) / 10);
cached_scalers.adjustedNotchSize = adjustedNotchSize;
BlockSvg.CUSTOM_NOTCHES.forEach((notch) => {
if (!notch.ogLeft) {
notch.ogLeft = notch.left;
Expand Down Expand Up @@ -204,7 +208,7 @@ export default async function ({ addon, console }) {
'a 4,4 0 0,1 -4,-4 z';

BlockSvg.INPUT_SHAPE_LEAF_WIDTH = 12 * GRID_UNIT * multiplier;
BlockSvg.INPUT_SHAPE_LEAF =
BlockSvg.INPUT_SHAPE_LEAF =
`M ${6 * GRID_UNIT * multiplier} 0
l ${2 * GRID_UNIT * multiplier} 0
a ${4 * GRID_UNIT * multiplier} ${4 * GRID_UNIT * multiplier} 0 0 1 ${4 * GRID_UNIT * multiplier} ${4 * GRID_UNIT * multiplier}
Expand All @@ -218,7 +222,7 @@ export default async function ({ addon, console }) {
z`;

BlockSvg.INPUT_SHAPE_PLUS_WIDTH = 12 * GRID_UNIT * multiplier;
BlockSvg.INPUT_SHAPE_PLUS =
BlockSvg.INPUT_SHAPE_PLUS =
`M ${9 * GRID_UNIT * multiplier} 0
a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier}
l 0 2
Expand All @@ -238,7 +242,7 @@ export default async function ({ addon, console }) {
a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${-GRID_UNIT * multiplier}
a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 0 ${GRID_UNIT * multiplier} ${-GRID_UNIT * multiplier}
l 0 -2
a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${-GRID_UNIT * multiplier}
a ${GRID_UNIT * multiplier} ${GRID_UNIT * multiplier} 0 0 1 ${GRID_UNIT * multiplier} ${-GRID_UNIT * multiplier}
z`;

BlockSvg.INPUT_SHAPE_HEIGHT = 8 * GRID_UNIT * multiplier;
Expand Down Expand Up @@ -357,5 +361,33 @@ export default async function ({ addon, console }) {
addon.self.addEventListener("reenabled", () => applyAndUpdate());

applyAndUpdate();

const og_custom_shape_register = BlockSvg.registerCustomShape;
BlockSvg.registerCustomShape = function(name, shape) {
const multiplier = cached_scalers.multiplier;
shape.ogEmptySize = shape.emptyInputWidth;
shape.ogEmptyPath = shape.emptyInputPath;
shape.emptyInputWidth = shape.ogEmptySize * multiplier;
shape.emptyInputPath = scalePathXY(shape.ogEmptyPath, multiplier, multiplier);
if (shape.emptyInputPath[0] !== "M" && shape.emptyInputPath[0] !== "m")
shape.emptyInputPath = "M" + shape.emptyInputPath;

og_custom_shape_register(name, shape);
};
const og_custom_notch_register = BlockSvg.registerCustomNotch;
BlockSvg.registerCustomNotch = function(name, notch) {
const adjustedNotchSize = cached_scalers.adjustedNotchSize;
const notchSize = cached_scalers.notchSize;

og_custom_notch_register(name, notch);

let registered_notch = BlockSvg.CUSTOM_NOTCHES.get(name);

registered_notch.ogLeft = registered_notch.left;
registered_notch.ogRight = registered_notch.right;
registered_notch.left = scalePathXY(registered_notch.ogLeft, adjustedNotchSize, notchSize);
registered_notch.right = scalePathXY(registered_notch.ogRight, adjustedNotchSize, notchSize);
};

})(window.Blockly);
}