From 799cd071747d98c3121bb2d9d2a22903475a0bf7 Mon Sep 17 00:00:00 2001
From: psychedelicious <4822129+psychedelicious@users.noreply.github.com>
Date: Thu, 11 May 2023 22:45:53 +1000
Subject: [PATCH] feat(ui): make core parameters layout consistent

---
 .../Parameters/ImageToImage/ImageToImageStrength.tsx         | 2 +-
 .../tabs/ImageToImage/ImageToImageTabCoreParameters.tsx      | 4 ++--
 .../tabs/UnifiedCanvas/UnifiedCanvasCoreParameters.tsx       | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx b/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx
index b467b15091..eea5ec3c27 100644
--- a/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Parameters/ImageToImage/ImageToImageStrength.tsx
@@ -47,7 +47,7 @@ const ImageToImageStrength = () => {
 
   return (
     <IAISlider
-      label={`${t('parameters.strength')}`}
+      label={`${t('parameters.denoisingStrength')}`}
       step={step}
       min={min}
       max={sliderMax}
diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabCoreParameters.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabCoreParameters.tsx
index 5d85230140..aba85646af 100644
--- a/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabCoreParameters.tsx
+++ b/invokeai/frontend/web/src/features/ui/components/tabs/ImageToImage/ImageToImageTabCoreParameters.tsx
@@ -64,8 +64,6 @@ const ImageToImageTabCoreParameters = () => {
             <ParamSteps />
             <ParamCFGScale />
           </Flex>
-          <ParamWidth isDisabled={!shouldFitToWidthHeight} />
-          <ParamHeight isDisabled={!shouldFitToWidthHeight} />
           <Flex gap={3} w="full">
             <Box flexGrow={2}>
               <ParamSampler />
@@ -74,6 +72,8 @@ const ImageToImageTabCoreParameters = () => {
               <ModelSelect />
             </Box>
           </Flex>
+          <ParamWidth isDisabled={!shouldFitToWidthHeight} />
+          <ParamHeight isDisabled={!shouldFitToWidthHeight} />
           <ImageToImageStrength />
           <ImageToImageFit />
         </Flex>
diff --git a/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasCoreParameters.tsx b/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasCoreParameters.tsx
index cc03ef560d..74949a399d 100644
--- a/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasCoreParameters.tsx
+++ b/invokeai/frontend/web/src/features/ui/components/tabs/UnifiedCanvas/UnifiedCanvasCoreParameters.tsx
@@ -62,8 +62,6 @@ const UnifiedCanvasCoreParameters = () => {
             <ParamSteps />
             <ParamCFGScale />
           </Flex>
-          <ParamWidth />
-          <ParamHeight />
           <Flex gap={3} w="full">
             <Box flexGrow={2}>
               <ParamSampler />
@@ -72,8 +70,9 @@ const UnifiedCanvasCoreParameters = () => {
               <ModelSelect />
             </Box>
           </Flex>
+          <ParamWidth />
+          <ParamHeight />
           <ImageToImageStrength />
-          <ImageToImageFit />
         </Flex>
       )}
     </Flex>