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 diff --git a/ui/easydiffusion/renderer.py b/ui/easydiffusion/renderer.py index 852cc0a2..b2eb2e0c 100644 --- a/ui/easydiffusion/renderer.py +++ b/ui/easydiffusion/renderer.py @@ -53,7 +53,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() 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; 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 = [ diff --git a/ui/media/js/dnd.js b/ui/media/js/dnd.js index 884f1c9a..94a5f2e4 100644 --- a/ui/media/js/dnd.js +++ b/ui/media/js/dnd.js @@ -294,14 +294,19 @@ function restoreTaskToUI(task, fieldsToSkip) { } } - // restore the original tag - promptField.value = task.reqBody.original_prompt || task.reqBody.prompt - // properly reset fields not present in the task if (!('use_hypernetwork_model' in task.reqBody)) { hypernetworkModelField.value = "" hypernetworkModelField.dispatchEvent(new Event("change")) } + + // 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 }