From 34042bb6ca1a05e11e109b43e479196074e5dca7 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sat, 16 Sep 2023 16:50:17 +0200 Subject: [PATCH] fix(carlita): Apply expand to inherited parts --- designs/carlita/src/front-facing.mjs | 21 ++++++++++++++++++++- designs/carlita/src/front-lining.mjs | 20 ++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/designs/carlita/src/front-facing.mjs b/designs/carlita/src/front-facing.mjs index 55ac8dcc5f2..43636b84191 100644 --- a/designs/carlita/src/front-facing.mjs +++ b/designs/carlita/src/front-facing.mjs @@ -3,7 +3,26 @@ import { frontFacing as carltonFrontFacing } from '@freesewing/carlton' export const frontFacing = { name: 'carlita.frontFacing', from: carltonFrontFacing, - draft: ({ points, macro, part }) => { + draft: ({ points, macro, expand, store, part }) => { + if (expand) store.flag.preset('expandIsOn') + else { + // Expand is on, do not draw the part but flag this to the user + store.flag.note({ + msg: `carlton:cutFrontFacing`, + suggest: { + text: 'flag:show', + icon: 'expand', + update: { + settings: ['expand', 1], + }, + }, + }) + // Also hint about expand + store.flag.preset('expandIsOff') + + return part.hide() + } + macro('title', { at: points.title, nr: '1c', diff --git a/designs/carlita/src/front-lining.mjs b/designs/carlita/src/front-lining.mjs index 404b010532b..8e601abf2d1 100644 --- a/designs/carlita/src/front-lining.mjs +++ b/designs/carlita/src/front-lining.mjs @@ -7,10 +7,30 @@ function draftCarlitaFrontLining({ store, points, macro, + expand, paths, Path, part, }) { + if (expand) store.flag.preset('expandIsOn') + else { + // Expand is on, do not draw the part but flag this to the user + store.flag.note({ + msg: `carlton:cutFrontLining`, + suggest: { + text: 'flag:show', + icon: 'expand', + update: { + settings: ['expand', 1], + }, + }, + }) + // Also hint about expand + store.flag.preset('expandIsOff') + + return part.hide() + } + const collar = paths.frontCollar.split(points.flbTop) const armhole = paths.frontArmhole