From 4e3b11c5c34b4b4eda920d230916ad44bb67a89f Mon Sep 17 00:00:00 2001 From: tim h Date: Thu, 31 Aug 2023 07:40:08 -0500 Subject: [PATCH 01/16] refiner updates etc --- index.html | 11 +++++------ pages/configuration.html | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/index.html b/index.html index 42ec558..2f40b03 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - + @@ -334,8 +334,7 @@
- Alpha release v0.0.16.6 - v2023xxxx.001 //TODO update + v20230831.001
- + - + @@ -592,7 +591,7 @@ src="js/initalize/workspace.populate.js?v=925431d" type="text/javascript"> - + diff --git a/pages/configuration.html b/pages/configuration.html index 9c156c5..fb5a204 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -1,4 +1,4 @@ - + @@ -259,6 +259,7 @@ : localStorage.getItem( "openoutpaint/settings.update-prompt-on-more-button" ) === "true"; + updatePromptOnMoreButton.checked = _enable_update_prompt_on_more_button; let _enable_jump_to_1st_new_on_more_button = localStorage.getItem( @@ -268,6 +269,7 @@ : localStorage.getItem( "openoutpaint/settings.jump-to-1st-new-on-more-button" ) === "true"; + jumpTo1stNewOnMoreButton.checked = _enable_jump_to_1st_new_on_more_button; writeToLocalStorage(); From 90dfea4f6a1f019bc5edb1ab0fce18b4bc2f0720 Mon Sep 17 00:00:00 2001 From: zero01101 Date: Sat, 9 Dec 2023 13:58:00 +0000 Subject: [PATCH 04/16] Prettified Code! --- index.html | 2 +- js/ui/tool/dream.js | 16 ++++++++-------- pages/configuration.html | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/index.html b/index.html index b558e32..90c1db0 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index d016d94..2ca6c76 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -1841,8 +1841,8 @@ const dreamTool = () => state.cursorSize > stableDiffusionData.width ? "#FBB5" : state.cursorSize < stableDiffusionData.width - ? "#BFB5" - : "#FFF5"; + ? "#BFB5" + : "#FFF5"; state.erasePrevReticle = _tool._reticle_draw( bb, @@ -1869,8 +1869,8 @@ const dreamTool = () => state.cursorSize > stableDiffusionData.width ? "#FBB5" : state.cursorSize < stableDiffusionData.width - ? "#BFB5" - : "#FFF5"; + ? "#BFB5" + : "#FFF5"; state.erasePrevReticle = _tool._reticle_draw( getBoundingBox( evn.x, @@ -2371,8 +2371,8 @@ const img2imgTool = () => state.cursorSize > stableDiffusionData.width ? "#FBB5" : state.cursorSize < stableDiffusionData.width - ? "#BFB5" - : "#FFF5"; + ? "#BFB5" + : "#FFF5"; state.erasePrevReticle = _tool._reticle_draw( bb, "Img2Img", @@ -2409,8 +2409,8 @@ const img2imgTool = () => state.cursorSize > stableDiffusionData.width ? "#FBB5" : state.cursorSize < stableDiffusionData.width - ? "#BFB5" - : "#FFF5"; + ? "#BFB5" + : "#FFF5"; state.erasePrevReticle = _tool._reticle_draw( bb, "Img2Img", diff --git a/pages/configuration.html b/pages/configuration.html index fb5a204..b7fe62a 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -1,4 +1,4 @@ - + From 29eaf84ec61a868710d71b682b561ad77c439484 Mon Sep 17 00:00:00 2001 From: AlexL Date: Mon, 11 Dec 2023 22:42:19 +0100 Subject: [PATCH 05/16] Slider visibility corrected --- js/ui/tool/dream.js | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index 2ca6c76..c3268bb 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -2015,12 +2015,12 @@ const dreamTool = () => state.ctxmenu.keepUnmaskedBlurSlider.classList.remove( "invisible" ); - state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.add( + state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.remove( "invisible" ); } else { state.ctxmenu.keepUnmaskedBlurSlider.classList.add("invisible"); - state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.remove( + state.ctxmenu.keepUnmaskedBlurSliderLinebreak.classList.add( "invisible" ); } @@ -2184,6 +2184,21 @@ const dreamTool = () => menu.appendChild(state.ctxmenu.outpaintTypeSelect); menu.appendChild(state.ctxmenu.overMaskPxLabel); menu.appendChild(state.ctxmenu.eagerGenerateCountLabel); + + if (localStorage.getItem("openoutpaint/dream-keepunmasked") == "true") { + state.ctxmenu.keepUnmaskedBlurSlider.classList.remove("invisible"); + } else { + state.ctxmenu.keepUnmaskedBlurSlider.classList.add("invisible"); + } + + if (localStorage.getItem("openoutpaint/dream-removebg") == "true") { + state.ctxmenu.carveBlurSlider.classList.remove("invisible"); + state.ctxmenu.carveThresholdSlider.classList.remove("invisible"); + } else { + state.ctxmenu.carveBlurSlider.classList.add("invisible"); + state.ctxmenu.carveThresholdSlider.classList.add("invisible"); + } + }, shortcut: "D", } @@ -2848,6 +2863,21 @@ const img2imgTool = () => menu.appendChild(btnArray2); menu.appendChild(state.ctxmenu.borderMaskSlider); menu.appendChild(state.ctxmenu.eagerGenerateCountLabel); + + if (localStorage.getItem("openoutpaint/img2img-keepunmasked") == "true") { + state.ctxmenu.keepUnmaskedBlurSlider.classList.remove("invisible"); + } else { + state.ctxmenu.keepUnmaskedBlurSlider.classList.add("invisible"); + } + + if (localStorage.getItem("openoutpaint/img2img-removebg") == "true") { + state.ctxmenu.carveBlurSlider.classList.remove("invisible"); + state.ctxmenu.carveThresholdSlider.classList.remove("invisible"); + } else { + state.ctxmenu.carveBlurSlider.classList.add("invisible"); + state.ctxmenu.carveThresholdSlider.classList.add("invisible"); + } + }, shortcut: "I", } From aeaf98a898f7c1fa815f0302947486c2d0fe639d Mon Sep 17 00:00:00 2001 From: AlexL Date: Fri, 15 Dec 2023 17:27:44 +0100 Subject: [PATCH 06/16] Fixed variable typo --- js/ui/tool/select.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/ui/tool/select.js b/js/ui/tool/select.js index ef38bfc..f89da91 100644 --- a/js/ui/tool/select.js +++ b/js/ui/tool/select.js @@ -420,7 +420,7 @@ const selectTransformTool = () => const lscursor = m.transformPoint({x: sx, y: sy}); const xs = lscursor.x / scaling.handle.x; - const xy = lscursor.y / scaling.handle.y; + const ys = lscursor.y / scaling.handle.y; let xscale = 1; let yscale = 1; @@ -429,7 +429,7 @@ const selectTransformTool = () => xscale = xs; yscale = ys; } else { - xscale = yscale = Math.max(xs, xy); + xscale = yscale = Math.max(xs, ys); } state.selected.scale = {x: xscale, y: yscale}; From 927084424d60c6dea7704795b082807591a7c191 Mon Sep 17 00:00:00 2001 From: zero01101 Date: Sat, 16 Dec 2023 12:28:35 +0000 Subject: [PATCH 07/16] Fixed resource hashes --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index 90c1db0..332aacb 100644 --- a/index.html +++ b/index.html @@ -571,7 +571,7 @@ src="js/ui/tool/generic.js?v=3e678e0" type="text/javascript"> - + @@ -579,7 +579,7 @@ src="js/ui/tool/colorbrush.js?v=84ff9fa" type="text/javascript"> - + - + @@ -584,7 +584,7 @@ - + diff --git a/pages/configuration.html b/pages/configuration.html index 2802982..1a241e4 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -10,7 +10,7 @@ - + From 14b3e63e95858d71e9d3f5f6d7f878a7ccfdf30d Mon Sep 17 00:00:00 2001 From: tim h Date: Sat, 27 Jan 2024 07:45:08 -0600 Subject: [PATCH 15/16] typo fix, version bump --- index.html | 6 +++--- js/index.js | 25 +++++++++++++++---------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/index.html b/index.html index 03236e3..e0fa89e 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -337,7 +337,7 @@
- v20231216.001 + v20240127.001
- +