diff --git a/invokeai/frontend/web/public/locales/en.json b/invokeai/frontend/web/public/locales/en.json index 62412565b7..c70aee83c5 100644 --- a/invokeai/frontend/web/public/locales/en.json +++ b/invokeai/frontend/web/public/locales/en.json @@ -70,7 +70,7 @@ "compositing": { "title": "Compositing", "coherenceTab": "Coherence Pass", - "infillMaskTab": "Infill & Mask" + "infillTab": "Infill" } }, "common": { diff --git a/invokeai/frontend/web/src/features/settingsAccordions/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx b/invokeai/frontend/web/src/features/settingsAccordions/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx index 191da91982..f819e7a1fc 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx @@ -16,9 +16,6 @@ import ParamMaskBlur from 'features/parameters/components/Canvas/Compositing/Mas import ParamMaskBlurMethod from 'features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod'; import ParamInfillMethod from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillMethod'; import ParamInfillOptions from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillOptions'; -import ParamScaleBeforeProcessing from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaleBeforeProcessing'; -import ParamScaledHeight from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaledHeight'; -import ParamScaledWidth from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaledWidth'; import { memo } from 'react'; import { useTranslation } from 'react-i18next'; @@ -34,7 +31,7 @@ export const CompositingSettingsAccordion = memo(() => { {t('accordions.compositing.coherenceTab')} - {t('accordions.compositing.infillMaskTab')} + {t('accordions.compositing.infillTab')} @@ -54,11 +51,6 @@ export const CompositingSettingsAccordion = memo(() => { - - - - - diff --git a/invokeai/frontend/web/src/features/settingsAccordions/ImageSettingsAccordion/ImageSettingsAccordion.tsx b/invokeai/frontend/web/src/features/settingsAccordions/ImageSettingsAccordion/ImageSettingsAccordion.tsx index e6927af0c8..d260028ea4 100644 --- a/invokeai/frontend/web/src/features/settingsAccordions/ImageSettingsAccordion/ImageSettingsAccordion.tsx +++ b/invokeai/frontend/web/src/features/settingsAccordions/ImageSettingsAccordion/ImageSettingsAccordion.tsx @@ -9,6 +9,9 @@ import { InvSingleAccordion } from 'common/components/InvSingleAccordion/InvSing import { HrfSettings } from 'features/hrf/components/HrfSettings'; import ParamBoundingBoxHeight from 'features/parameters/components/Canvas/BoundingBox/ParamBoundingBoxHeight'; import ParamBoundingBoxWidth from 'features/parameters/components/Canvas/BoundingBox/ParamBoundingBoxWidth'; +import ParamScaleBeforeProcessing from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaleBeforeProcessing'; +import ParamScaledHeight from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaledHeight'; +import ParamScaledWidth from 'features/parameters/components/Canvas/InfillAndScaling/ParamScaledWidth'; import { ParamHeight } from 'features/parameters/components/Core/ParamHeight'; import { ParamWidth } from 'features/parameters/components/Core/ParamWidth'; import { AspectRatioPreviewWrapper } from 'features/parameters/components/ImageSize/AspectRatioPreviewWrapper'; @@ -42,6 +45,10 @@ const labelProps: InvLabelProps = { w: 12, }; +const scalingLabelProps: InvLabelProps = { + w: '4.5rem', +}; + export const ImageSettingsAccordion = () => { const { t } = useTranslation(); const { badges, activeTabName } = useAppSelector(selector); @@ -74,6 +81,15 @@ export const ImageSettingsAccordion = () => { {activeTabName === 'txt2img' && } {activeTabName === 'img2img' && } {activeTabName === 'img2img' && } + {activeTabName === 'unifiedCanvas' && ( + <> + + + + + + + )}