diff --git a/src/components/ModCanvastools.jsx b/src/components/ModCanvastools.jsx index b89eebe..16affc8 100644 --- a/src/components/ModCanvastools.jsx +++ b/src/components/ModCanvastools.jsx @@ -194,6 +194,7 @@ function ModCanvastools() { case 'makenull': // eslint-disable-next-line max-len descCleanAction = t`Turn every pixel in area to 0 (YOU REALLY SHOULDN'T DO THAT ON ANY AREA THAT ISN'T ALREADY MOSTLY 0)`; + break; default: // nothing } diff --git a/src/components/windows/CanvasSelect.jsx b/src/components/windows/CanvasSelect.jsx index 9d976bd..d7e1896 100644 --- a/src/components/windows/CanvasSelect.jsx +++ b/src/components/windows/CanvasSelect.jsx @@ -37,8 +37,19 @@ Archive of removed canvases can be accessed here:`} >{t`Archive`}
{ - Object.keys(canvases).map((canvasId) => ( - (!canvases[canvasId].hid || showHiddenCanvases) + Object.keys(canvases) + .sort((a, b) => { + // display forced default canvas first + if (a === window.ssv.dc) return -1; + if (b === window.ssv.dc) return 1; + // display linked canvas right after canvas they are linked too + // eslint-disable-next-line eqeqeq + if (canvases[a].linkcd != null) a = canvases[a].linkcd + 0.1; + // eslint-disable-next-line eqeqeq + if (canvases[b].linkcd != null) b = canvases[b].linkcd + 0.1; + return a - b; + }).map((canvasId) => ( + (!canvases[canvasId].hid || showHiddenCanvases) && !canvases[canvasId].ed && (