Mirrored_Repos/InvokeAI
1
0
Fork 0
mirror of https://github.com/invoke-ai/InvokeAI synced 2024-08-30 20:32:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ui): move scaling up to image settings -> advanced

Browse Source
This commit is contained in:
psychedelicious 2023-12-29 11:59:21 +11:00 committed by Kent Keirsey
parent 4f2930412e
commit 37786a26a5
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
invokeai/frontend/web/public/locales/en.json
View File

@ -70,7 +70,7 @@
"compositing": { "compositing": {
"title": "Compositing", "title": "Compositing",
"coherenceTab": "Coherence Pass", "coherenceTab": "Coherence Pass",
"infillMaskTab": "Infill & Mask" "infillTab": "Infill"
} }
}, },
"common": { "common": {

10
invokeai/frontend/web/src/features/settingsAccordions/CompositingSettingsAccordion/CompositingSettingsAccordion.tsx
View File

@ -16,9 +16,6 @@ import ParamMaskBlur from 'features/parameters/components/Canvas/Compositing/Mas
import ParamMaskBlurMethod from 'features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod'; import ParamMaskBlurMethod from 'features/parameters/components/Canvas/Compositing/MaskAdjustment/ParamMaskBlurMethod';
import ParamInfillMethod from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillMethod'; import ParamInfillMethod from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillMethod';
import ParamInfillOptions from 'features/parameters/components/Canvas/InfillAndScaling/ParamInfillOptions'; 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 { memo } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@ -34,7 +31,7 @@ export const CompositingSettingsAccordion = memo(() => {
<InvTabs variant="collapse"> <InvTabs variant="collapse">
<InvTabList> <InvTabList>
<InvTab>{t('accordions.compositing.coherenceTab')}</InvTab> <InvTab>{t('accordions.compositing.coherenceTab')}</InvTab>
<InvTab>{t('accordions.compositing.infillMaskTab')}</InvTab> <InvTab>{t('accordions.compositing.infillTab')}</InvTab>
</InvTabList> </InvTabList>
<InvTabPanels> <InvTabPanels>
<InvTabPanel> <InvTabPanel>
@ -54,11 +51,6 @@ export const CompositingSettingsAccordion = memo(() => {
<ParamInfillMethod /> <ParamInfillMethod />
<ParamInfillOptions /> <ParamInfillOptions />
</InvControlGroup> </InvControlGroup>
<ParamScaleBeforeProcessing />
<InvControlGroup labelProps={coherenceLabelProps}>
<ParamScaledWidth />
<ParamScaledHeight />
</InvControlGroup>
</Flex> </Flex>
</InvTabPanel> </InvTabPanel>
</InvTabPanels> </InvTabPanels>

16
invokeai/frontend/web/src/features/settingsAccordions/ImageSettingsAccordion/ImageSettingsAccordion.tsx
View File

@ -9,6 +9,9 @@ import { InvSingleAccordion } from 'common/components/InvSingleAccordion/InvSing
import { HrfSettings } from 'features/hrf/components/HrfSettings'; import { HrfSettings } from 'features/hrf/components/HrfSettings';
import ParamBoundingBoxHeight from 'features/parameters/components/Canvas/BoundingBox/ParamBoundingBoxHeight'; import ParamBoundingBoxHeight from 'features/parameters/components/Canvas/BoundingBox/ParamBoundingBoxHeight';
import ParamBoundingBoxWidth from 'features/parameters/components/Canvas/BoundingBox/ParamBoundingBoxWidth'; 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 { ParamHeight } from 'features/parameters/components/Core/ParamHeight';
import { ParamWidth } from 'features/parameters/components/Core/ParamWidth'; import { ParamWidth } from 'features/parameters/components/Core/ParamWidth';
import { AspectRatioPreviewWrapper } from 'features/parameters/components/ImageSize/AspectRatioPreviewWrapper'; import { AspectRatioPreviewWrapper } from 'features/parameters/components/ImageSize/AspectRatioPreviewWrapper';
@ -42,6 +45,10 @@ const labelProps: InvLabelProps = {
w: 12, w: 12,
}; };
const scalingLabelProps: InvLabelProps = {
w: '4.5rem',
};
export const ImageSettingsAccordion = () => { export const ImageSettingsAccordion = () => {
const { t } = useTranslation(); const { t } = useTranslation();
const { badges, activeTabName } = useAppSelector(selector); const { badges, activeTabName } = useAppSelector(selector);
@ -74,6 +81,15 @@ export const ImageSettingsAccordion = () => {
{activeTabName === 'txt2img' && <HrfSettings />} {activeTabName === 'txt2img' && <HrfSettings />}
{activeTabName === 'img2img' && <ImageToImageFit />} {activeTabName === 'img2img' && <ImageToImageFit />}
{activeTabName === 'img2img' && <ImageToImageStrength />} {activeTabName === 'img2img' && <ImageToImageStrength />}
{activeTabName === 'unifiedCanvas' && (
<>
<ParamScaleBeforeProcessing />
<InvControlGroup labelProps={scalingLabelProps}>
<ParamScaledWidth />
<ParamScaledHeight />
</InvControlGroup>
</>
)}
</Flex> </Flex>
</InvExpander> </InvExpander>
</Flex> </Flex>