From ad07aeb041e06c3e95b809ac2c86537284c27d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jens=20S=C3=BClwald?= Date: Wed, 28 Dec 2022 17:52:49 +0100 Subject: [PATCH 1/5] Restore download link for Linux in beta, ... and make shellscripts in scripts/ executable --- README.md | 2 +- scripts/start.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0115e43a..fc6a5dac 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Click the download button for your operating system:

- +

## On Windows: diff --git a/scripts/start.sh b/scripts/start.sh index 4bb6cb66..61ac3f74 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -19,4 +19,5 @@ which conda conda --version || exit 1 # Download the rest of the installer and UI +chmod +x scripts/*.sh scripts/on_env_start.sh From e82a8a7f3daa175c0a3f6831aae15d24893e67ed Mon Sep 17 00:00:00 2001 From: patriceac <48073125+patriceac@users.noreply.github.com> Date: Wed, 28 Dec 2022 12:06:36 -0800 Subject: [PATCH 2/5] Fix for duplicate images When eye correction, upscaling, and only show filtered image are ALL disabled, the UI still generates two of the same image, and increments the second's seed by 1 (although it's the same image). It doesn't perform an additional process, but the item is shown twice. --- ui/easydiffusion/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/easydiffusion/renderer.py b/ui/easydiffusion/renderer.py index e1fba7ca..c2860600 100644 --- a/ui/easydiffusion/renderer.py +++ b/ui/easydiffusion/renderer.py @@ -48,7 +48,7 @@ def make_images_internal(req: GenerateImageRequest, task_data: TaskData, data_qu if task_data.save_to_disk_path is not None: save_images_to_disk(images, filtered_images, req, task_data) - return filtered_images if task_data.show_only_filtered_image else images + filtered_images + return filtered_images if task_data.show_only_filtered_image or (task_data.use_face_correction is None and task_data.use_upscale is None) else images + filtered_images def generate_images_internal(req: GenerateImageRequest, task_data: TaskData, data_queue: queue.Queue, task_temp_images: list, step_callback, stream_image_progress: bool): context.temp_images.clear() From 0f05f9c32c72985fb1a83d13bd447835dcd733fb Mon Sep 17 00:00:00 2001 From: patriceac <48073125+patriceac@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:30:59 -0800 Subject: [PATCH 3/5] Limit the size of zoomed-in source images If the source image has a high enough resolution it won't fit on the screen when hovering over it. This simple fix limits the max size so the user always has a chance to see the full image. --- ui/media/css/main.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/media/css/main.css b/ui/media/css/main.css index 3a4883a7..dc2d6b8c 100644 --- a/ui/media/css/main.css +++ b/ui/media/css/main.css @@ -1112,6 +1112,8 @@ div.task-initimg:hover div.task-fs-initimage { z-index: 9999; box-shadow: 0 0 30px #000; margin-top:-64px; + max-width: 75vw; + max-height: 75vh; } div.top-right { position: absolute; From f6b3cde286c760feeca407b868fde4d7e62ef250 Mon Sep 17 00:00:00 2001 From: patriceac <48073125+patriceac@users.noreply.github.com> Date: Wed, 28 Dec 2022 17:50:18 -0800 Subject: [PATCH 4/5] Persist the process order toggle across sessions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤷 --- ui/media/js/auto-save.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ui/media/js/auto-save.js b/ui/media/js/auto-save.js index 9ba47ec4..18379eed 100644 --- a/ui/media/js/auto-save.js +++ b/ui/media/js/auto-save.js @@ -41,7 +41,8 @@ const SETTINGS_IDS_LIST = [ "confirm_dangerous_actions", "metadata_output_format", "auto_save_settings", - "apply_color_correction" + "apply_color_correction", + "process_order_toggle" ] const IGNORE_BY_DEFAULT = [ From ae318132395af87b38eb381112bdb3376bcb511b Mon Sep 17 00:00:00 2001 From: patriceac <48073125+patriceac@users.noreply.github.com> Date: Wed, 28 Dec 2022 18:52:18 -0800 Subject: [PATCH 5/5] Restore the original prompt if provided Restore the original prompt if provided... including if it's empty now that empty prompts are allowed if there are modifiers. --- ui/media/js/dnd.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js index 4d3f8af8..0f4c9dcf 100644 --- a/ui/media/js/dnd.js +++ b/ui/media/js/dnd.js @@ -294,9 +294,12 @@ function restoreTaskToUI(task, fieldsToSkip) { } } - // restore the original tag - promptField.value = task.reqBody.original_prompt || task.reqBody.prompt - + // restore the original prompt if provided (e.g. use settings), fallback to prompt as needed (e.g. copy/paste or d&d) + promptField.value = task.reqBody.original_prompt + if (!('original_prompt' in task.reqBody)) { + promptField.value = task.reqBody.prompt + } + // properly reset checkboxes if (!('use_face_correction' in task.reqBody)) { useFaceCorrectionField.checked = false