This commit is contained in:
Kent Keirsey
2025-06-30 11:15:16 -04:00
committed by psychedelicious
parent 264cc5ef46
commit 8cd3bcd1c0
3 changed files with 5 additions and 3 deletions

View File

@@ -29,7 +29,7 @@ const ParamTileControlNetModel = () => {
return (
<FormControl isDisabled={!options.length} isInvalid={!options.length} minW={0} flexGrow={1} gap={2}>
<FormLabel m={0}>{t('controlLayers.controlNet')}</FormLabel>
<FormLabel m={0}>{t('controlNet')}</FormLabel>
<Combobox value={value} options={options} onChange={onChange} noOptionsMessage={noOptionsMessage} />
</FormControl>
);

View File

@@ -15,7 +15,9 @@ import ParamSeamlessYAxis from 'features/parameters/components/Seamless/ParamSea
import ParamFLUXVAEModelSelect from 'features/parameters/components/VAEModel/ParamFLUXVAEModelSelect';
import ParamVAEModelSelect from 'features/parameters/components/VAEModel/ParamVAEModelSelect';
import ParamVAEPrecision from 'features/parameters/components/VAEModel/ParamVAEPrecision';
import ParamTileControlNetModel from 'features/parameters/components/Upscale/ParamTileControlNetModel';
import { useStandaloneAccordionToggle } from 'features/settingsAccordions/hooks/useStandaloneAccordionToggle';
import { selectActiveTab } from 'features/ui/store/uiSelectors';
import { memo, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { useGetModelConfigQuery } from 'services/api/endpoints/models';
@@ -33,6 +35,7 @@ export const AdvancedSettingsAccordion = memo(() => {
const { currentData: vaeConfig } = useGetModelConfigQuery(vaeKey ?? skipToken);
const isFLUX = useAppSelector(selectIsFLUX);
const isSD3 = useAppSelector(selectIsSD3);
const activeTab = useAppSelector(selectActiveTab);
const selectBadges = useMemo(
() =>
@@ -112,6 +115,7 @@ export const AdvancedSettingsAccordion = memo(() => {
<ParamCLIPGEmbedModelSelect />
</FormControlGroup>
)}
{activeTab === 'upscaling' && <ParamTileControlNetModel />}
</Flex>
</StandaloneAccordion>
);

View File

@@ -5,7 +5,6 @@ import { roundDownToMultiple } from 'common/util/roundDownToMultiple';
import ParamCreativity from 'features/parameters/components/Upscale/ParamCreativity';
import ParamSpandrelModel from 'features/parameters/components/Upscale/ParamSpandrelModel';
import ParamStructure from 'features/parameters/components/Upscale/ParamStructure';
import ParamTileControlNetModel from 'features/parameters/components/Upscale/ParamTileControlNetModel';
import { selectUpscaleSlice } from 'features/parameters/store/upscaleSlice';
import { getGridSize } from 'features/parameters/util/optimalDimension';
import { UpscaleScaleSlider } from 'features/settingsAccordions/components/UpscaleSettingsAccordion/UpscaleScaleSlider';
@@ -71,7 +70,6 @@ export const UpscaleSettingsAccordion = memo(() => {
</Flex>
<Expander label={t('accordions.advanced.options')} isOpen={isOpenExpander} onToggle={onToggleExpander}>
<Flex gap={4} pb={4} flexDir="column">
<ParamTileControlNetModel />
<ParamCreativity />
<ParamStructure />
</Flex>