From 01853cac241ab6e5543998b1fa7cb4a28b8823c3 Mon Sep 17 00:00:00 2001 From: Raykosan <71210053+Raykosan@users.noreply.github.com> Date: Thu, 18 Jun 2026 08:58:37 +0300 Subject: [PATCH] Fixed resetting the mask color to default after pressing the ACCEPT and CANCEL buttons --- __init__.py | 2 +- package.json | 2 +- pyproject.toml | 2 +- web/rs_outpaint.js | 13 +++++++++++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/__init__.py b/__init__.py index 6401291..18b6301 100644 --- a/__init__.py +++ b/__init__.py @@ -29,7 +29,7 @@ IGNORED_MODULES: Set[str] = {'__init__.py'} REQUIRED_MODULES: Set[str] = set() PACKAGE_DISPLAY_NAME = "ComfyUI_RaykoStudio" -__version__ = "0.23.2" +__version__ = "0.23.3" def load_modules(): print(f"🦊 {PACKAGE_DISPLAY_NAME}: Version: {__version__}") diff --git a/package.json b/package.json index 65f7024..666747f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ComfyUI_RaykoStudio", - "version": "0.23.2", + "version": "0.23.3", "description": "Set of custom nodes for ComfyUI providing additional image processing capabilities", "author": "Raykosan", "license": "Apache License 2.0", diff --git a/pyproject.toml b/pyproject.toml index ae3e668..bcadff8 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,7 @@ [project] name = "ComfyUI_RaykoStudio" description = "Set of custom nodes for ComfyUI providing additional image processing capabilities" -version = "0.23.2" +version = "0.23.3" license = { file = "LICENSE" } dependencies = ["torch>=1.7.0", "numpy>=1.19.0", "Pillow>=8.0.0", "freetype-py>=2.5.1"] diff --git a/web/rs_outpaint.js b/web/rs_outpaint.js index 7786be1..2c3afa9 100644 --- a/web/rs_outpaint.js +++ b/web/rs_outpaint.js @@ -94,12 +94,21 @@ function setUIActive(dom, isActive) { } function resetNodeState(st, dom, widgets) { + // Сохраняем пользовательские цвета перед сбросом, чтобы не терять выбор + const savedMaskColor = st.maskColor; + const savedBgColor = st.bgColor; + Object.assign(st, createState()); + + // Восстанавливаем пользовательские цвета + st.maskColor = savedMaskColor; + st.bgColor = savedBgColor; + st.arLocked = false; dom.arBtn.textContent = "🔓"; dom.arBtn.style.border = "1px solid #444"; dom.arBtn.style.background = "#2a2a2a"; dom.arBtn.style.color = "#bbb"; dom.arBtn._active = false; if(dom.wInput) dom.wInput.value = ""; if(dom.hInput) dom.hInput.value = ""; - if(dom.maskColorInput) { st.maskColor = "#ff0000"; dom.maskColorInput.picker.value = st.maskColor; dom.maskColorInput.swatch.style.background = st.maskColor; dom.maskColorInput.hexInput.value = st.maskColor.toUpperCase(); } - if(dom.bgColorInput) { st.bgColor = "#141414"; dom.bgColorInput.picker.value = st.bgColor; dom.bgColorInput.swatch.style.background = st.bgColor; dom.bgColorInput.hexInput.value = st.bgColor.toUpperCase(); } + if(dom.maskColorInput) { dom.maskColorInput.picker.value = st.maskColor; dom.maskColorInput.swatch.style.background = st.maskColor; dom.maskColorInput.hexInput.value = st.maskColor.toUpperCase(); } + if(dom.bgColorInput) { dom.bgColorInput.picker.value = st.bgColor; dom.bgColorInput.swatch.style.background = st.bgColor; dom.bgColorInput.hexInput.value = st.bgColor.toUpperCase(); } if(dom.waitingMsg) dom.waitingMsg.style.display = "none"; if(dom.acceptBtn) { dom.acceptBtn.style.display = "none"; dom.acceptBtn.textContent = "✔️ ACCEPT"; dom.acceptBtn.disabled = false; } if(dom.cancelBtn) dom.cancelBtn.style.display = "none";