From 9568ac66e0aca8124ad7f6c959d9532b2ac035c0 Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Thu, 24 Nov 2022 19:37:04 +1100 Subject: [PATCH] Improves scaled bbox display logic --- .../canvas/components/IAICanvasStatusText.tsx | 36 +++++++++++++------ 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/frontend/src/features/canvas/components/IAICanvasStatusText.tsx b/frontend/src/features/canvas/components/IAICanvasStatusText.tsx index 099c322313..2263ea3d57 100644 --- a/frontend/src/features/canvas/components/IAICanvasStatusText.tsx +++ b/frontend/src/features/canvas/components/IAICanvasStatusText.tsx @@ -23,14 +23,24 @@ const selector = createSelector( boundingBoxScaleMethod, } = canvas; + let boundingBoxColor = 'inherit'; + + if ( + (boundingBoxScaleMethod === 'none' && + (boxWidth < 512 || boxHeight < 512)) || + (boundingBoxScaleMethod === 'manual' && + scaledBoxWidth * scaledBoxHeight < 512 * 512) + ) { + boundingBoxColor = 'var(--status-working-color)'; + } + + const activeLayerColor = + layer === 'mask' ? 'var(--status-working-color)' : 'inherit'; + return { - activeLayerColor: - layer === 'mask' ? 'var(--status-working-color)' : 'inherit', + activeLayerColor, activeLayerString: layer.charAt(0).toUpperCase() + layer.slice(1), - boundingBoxColor: - boxWidth < 512 || boxHeight < 512 - ? 'var(--status-working-color)' - : 'inherit', + boundingBoxColor, boundingBoxCoordinatesString: `(${roundToHundreth( boxX )}, ${roundToHundreth(boxY)})`, @@ -42,6 +52,7 @@ const selector = createSelector( canvasDimensionsString: `${stageWidth}×${stageHeight}`, canvasScaleString: Math.round(stageScale * 100), shouldShowCanvasDebugInfo, + shouldShowBoundingBox: boundingBoxScaleMethod !== 'auto', shouldShowScaledBoundingBox: boundingBoxScaleMethod !== 'none', }; }, @@ -65,6 +76,7 @@ const IAICanvasStatusText = () => { canvasDimensionsString, canvasScaleString, shouldShowCanvasDebugInfo, + shouldShowBoundingBox, } = useAppSelector(selector); return ( @@ -75,11 +87,13 @@ const IAICanvasStatusText = () => { }} >{`Active Layer: ${activeLayerString}`}
{`Canvas Scale: ${canvasScaleString}%`}
-
{`Bounding Box: ${boundingBoxDimensionsString}`}
+ {shouldShowBoundingBox && ( +
{`Bounding Box: ${boundingBoxDimensionsString}`}
+ )} {shouldShowScaledBoundingBox && (