From bc63f8533e3fb359e13f5e50a14d2cf6a4acbec5 Mon Sep 17 00:00:00 2001
From: Nayam Amarshe <25067102+NayamAmarshe@users.noreply.github.com>
Date: Sun, 21 Apr 2024 22:57:16 +0530
Subject: [PATCH] Add scale on main screen

---
 renderer/atoms/userSettingsAtom.ts            |  2 +-
 .../settings-tab/CompressionInput.tsx         |  4 +-
 .../settings-tab/ImageScaleSelect.tsx         | 51 +++++++++++++-----
 .../upscayl-tab/config/LeftPaneImageSteps.tsx | 53 ++++++++++---------
 4 files changed, 70 insertions(+), 40 deletions(-)

diff --git a/renderer/atoms/userSettingsAtom.ts b/renderer/atoms/userSettingsAtom.ts
index b8d6c14..e3aacd9 100644
--- a/renderer/atoms/userSettingsAtom.ts
+++ b/renderer/atoms/userSettingsAtom.ts
@@ -6,7 +6,7 @@ export const customModelsPathAtom = atomWithStorage<string | null>(
   null,
 );
 
-export const scaleAtom = atomWithStorage<"2" | "3" | "4">("scale", "4");
+export const scaleAtom = atomWithStorage<string>("scale", "4");
 
 export const batchModeAtom = atom<boolean>(false);
 
diff --git a/renderer/components/settings-tab/CompressionInput.tsx b/renderer/components/settings-tab/CompressionInput.tsx
index f5d392c..e50d442 100644
--- a/renderer/components/settings-tab/CompressionInput.tsx
+++ b/renderer/components/settings-tab/CompressionInput.tsx
@@ -14,8 +14,8 @@ export function CompressionInput({
       </div>
       {compression > 0 && (
         <p className="text-xs text-base-content/80">
-          PNG compression is lossless. It might not have a significant effect on
-          some images.
+          PNG compression is lossless, so it might not reduce the file size
+          significantly. JPG and WebP compression is lossy.
         </p>
       )}
       <input
diff --git a/renderer/components/settings-tab/ImageScaleSelect.tsx b/renderer/components/settings-tab/ImageScaleSelect.tsx
index f31d285..bfa2401 100644
--- a/renderer/components/settings-tab/ImageScaleSelect.tsx
+++ b/renderer/components/settings-tab/ImageScaleSelect.tsx
@@ -1,30 +1,55 @@
 import { useCustomWidthAtom } from "@/atoms/userSettingsAtom";
-import { useAtom } from "jotai";
+import { useAtom, useAtomValue } from "jotai";
 
 type ImageScaleSelectProps = {
-  scale: "4" | "2" | "3";
-  setScale: (arg: "4" | "2" | "3") => void;
+  scale: string;
+  setScale: React.Dispatch<React.SetStateAction<string>>;
+  hideInfo?: boolean;
 };
 
-export function ImageScaleSelect({ scale, setScale }: ImageScaleSelectProps) {
-  const [useCustomWidth, setUseCustomWidth] = useAtom(useCustomWidthAtom);
+export function ImageScaleSelect({
+  scale,
+  setScale,
+  hideInfo,
+}: ImageScaleSelectProps) {
+  const useCustomWidth = useAtomValue(useCustomWidthAtom);
 
   return (
     <div className={`${useCustomWidth && "opacity-50"}`}>
       <div className="flex flex-row gap-1">
-        <p className="text-sm font-medium">
-          IMAGE SCALE ({scale}X) {useCustomWidth && "DISABLED"}
-        </p>
+        {hideInfo ? (
+          <>
+            <p className="text-sm">
+              Image Scale <span className="text-xs">({scale}X)</span>
+            </p>
+            {hideInfo && parseInt(scale) >= 6 && (
+              <p
+                className="badge badge-warning text-xs font-bold"
+                data-tooltip-id="tooltip"
+                data-tooltip-content="Anything above 5X may cause performance issues on some devices!"
+              >
+                !
+              </p>
+            )}
+          </>
+        ) : (
+          <p className="text-sm font-medium">
+            IMAGE SCALE ({scale}X) {useCustomWidth && "DISABLED"}
+          </p>
+        )}
       </div>
-      <p className="text-xs text-base-content/80">
-        Anything above 4X (except 16X Double Upscayl) only resizes the image and
-        does not use AI upscaling.
-      </p>
-      {parseInt(scale) >= 6 && (
+      {!hideInfo && (
+        <p className="text-xs text-base-content/80">
+          Anything above 4X (except 16X Double Upscayl) only resizes the image
+          and does not use AI upscaling.
+        </p>
+      )}
+      {!hideInfo && parseInt(scale) >= 6 && (
         <p className="text-xs text-base-content/80 text-red-500">
           This may cause performance issues on some devices!
         </p>
       )}
+
       <input
         type="range"
         min="1"
diff --git a/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx b/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx
index 77dbf6a..778dfb4 100644
--- a/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx
+++ b/renderer/components/upscayl-tab/config/LeftPaneImageSteps.tsx
@@ -19,6 +19,7 @@ import COMMAND from "@common/commands";
 import Select from "react-select";
 import { cn } from "@/lib/utils";
 import { useToast } from "@/components/ui/use-toast";
+import { ImageScaleSelect } from "@/components/settings-tab/ImageScaleSelect";
 
 interface IProps {
   selectImageHandler: () => Promise<void>;
@@ -62,7 +63,7 @@ function LeftPaneImageSteps({
   });
 
   const modelOptions = useAtomValue(modelsListAtom);
-  const scale = useAtomValue(scaleAtom);
+  const [scale, setScale] = useAtom(scaleAtom);
   const noImageProcessing = useAtomValue(noImageProcessingAtom);
   const [outputPath, setOutputPath] = useAtom(savedOutputPathAtom);
   const [progress, setProgress] = useAtom(progressAtom);
@@ -204,32 +205,34 @@ function LeftPaneImageSteps({
       </div>
 
       {/* STEP 2 */}
-      <div className="animate-step-in group">
-        <p className="step-heading">Step 2</p>
-        <p className="mb-2 text-sm">Select Model</p>
+      <div className="animate-step-in group flex flex-col gap-4">
+        <div>
+          <p className="step-heading">Step 2</p>
+          <p className="mb-2 text-sm">Select Model</p>
 
-        <Select
-          onMenuOpen={() => setOpen(true)}
-          onMenuClose={() => setOpen(false)}
-          options={modelOptions}
-          components={{
-            IndicatorSeparator: () => null,
-            DropdownIndicator: () => null,
-          }}
-          onChange={(e) => {
-            handleModelChange(e);
-            setCurrentModel({ label: e.label, value: e.value });
-          }}
-          className={cn(
-            "react-select-container transition-all group-hover:w-full group-active:w-full focus:w-full",
-            open && "!w-full",
-          )}
-          classNamePrefix="react-select"
-          value={currentModel}
-        />
+          <Select
+            onMenuOpen={() => setOpen(true)}
+            onMenuClose={() => setOpen(false)}
+            options={modelOptions}
+            components={{
+              IndicatorSeparator: () => null,
+              DropdownIndicator: () => null,
+            }}
+            onChange={(e) => {
+              handleModelChange(e);
+              setCurrentModel({ label: e.label, value: e.value });
+            }}
+            className={cn(
+              "react-select-container transition-all group-hover:w-full group-active:w-full focus:w-full",
+              open && "!w-full",
+            )}
+            classNamePrefix="react-select"
+            value={currentModel}
+          />
+        </div>
 
         {!batchMode && (
-          <div className="mt-4 flex items-center gap-1">
+          <div className="flex items-center gap-1">
             <input
               type="checkbox"
               className="checkbox"
@@ -259,6 +262,8 @@ function LeftPaneImageSteps({
             </button>
           </div>
         )}
+
+        <ImageScaleSelect scale={scale} setScale={setScale} hideInfo />
       </div>
 
       {/* STEP 3 */}