diff --git a/README.md b/README.md index 6abbf90..879c083 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ this is a completely vanilla javascript and html canvas outpainting convenience - arbitrary dream reticle size - draw the rectangle of your dreams - an [effectively infinite](https://github.com/zero01101/openOutpaint/pull/108), resizable, scalable canvas for you to paint all over - **_NOTE: v0.0.10 introduces a new "camera control" modifier key - hold [`CTRL`] and use the scrollwheel to zoom (scroll the wheel or use the two-finger vertical gesture on, uh, modern touchpads) and pan (hold the scrollwheel button, or if you don't have one, left-click button) around the canvas_** -- extremely limited, janky support for a shockingly restrictive list of A1111 extensions including controlnet inpainting for legitimately [magic](https://github.com/Mikubill/sd-webui-controlnet/discussions/1464) [promptless inpainting](https://github.com/Mikubill/sd-webui-controlnet/discussions/1143) and [outpainting](https://github.com/Mikubill/sd-webui-controlnet/discussions/1597) and in-line reference preprocessors for keeping existing style while replacing things (reference requires at least 2 controlnet units enabled in A1111 settings), as well as a very very basic dynamic-prompts-on-or-off toggle +- extremely limited, janky support for a shockingly restrictive list of A1111 extensions including controlnet inpainting for legitimately magic promptless inpainting and outpainting ([a](https://github.com/Mikubill/sd-webui-controlnet/discussions/1464), [b](https://github.com/Mikubill/sd-webui-controlnet/discussions/1143), [c](https://github.com/Mikubill/sd-webui-controlnet/discussions/1597)) and in-line reference preprocessors for keeping existing style while replacing things (reference requires at least 2 controlnet units enabled in A1111 settings), as well as a very very basic dynamic-prompts-on-or-off toggle - **_NOTE: this is_ JANKY, _pull requests greatly welcomed lol_** - a very nicely functional and familiar layer system - save, load, import, and export workspaces - includes all your layers, history, canvas size, you name it! diff --git a/css/index.css b/css/index.css index f12b8e1..66351d7 100644 --- a/css/index.css +++ b/css/index.css @@ -82,9 +82,7 @@ body { max-height: 0; overflow-y: clip; overflow-x: visible; - transition: - max-height 0.2s ease-out, - height 0s ease-out; + transition: max-height 0.2s ease-out, height 0s ease-out; } .menu-container { @@ -132,9 +130,10 @@ body { border-radius: 10px; - min-width: 360px; - width: 360px; - /* min-height: 250px; */ + min-width: 400px; + width: 400px; + min-height: 260px; + height: 260px; color: var(--c-text); diff --git a/index.html b/index.html index f0f68d8..766ebc5 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -315,8 +315,8 @@
- Alpha release v0.0.16.4 - v20230722.002 + Alpha release v0.0.16.5 + v20230812.001
- + diff --git a/js/ui/tool/dream.js b/js/ui/tool/dream.js index be64550..72d4c68 100644 --- a/js/ui/tool/dream.js +++ b/js/ui/tool/dream.js @@ -62,12 +62,9 @@ const _monitorProgress = (bb, oncheck = null) => { } const timeSpent = performance.now() - init; - setTimeout( - () => { - if (running) _checkProgress(); - }, - Math.max(0, minDelay - timeSpent) - ); + setTimeout(() => { + if (running) _checkProgress(); + }, Math.max(0, minDelay - timeSpent)); }; _checkProgress(); @@ -697,10 +694,29 @@ const _generate = async (endpoint, request, bb, options = {}) => { parseInt(requestCopy.seed) + requestCopy.batch_size * requestCopy.n_iter; } + + if ( + localStorage.getItem( + "openoutpaint/settings.update-prompt-on-more-button" + ) == "true" + ) { + requestCopy.prompt = document.getElementById("prompt").value; + requestCopy.negative_prompt = + document.getElementById("negPrompt").value; + } dreamData = await _dream(endpoint, requestCopy); images.push(...dreamData.images); seeds.push(...dreamData.seeds); - updateImageIndexText(); + if ( + localStorage.getItem( + "openoutpaint/settings.jump-to-1st-new-on-more-button" + ) == "true" + ) { + at = images.length - requestCopy.n_iter * requestCopy.batch_size; + activateImgAt(at); + } else { + updateImageIndexText(); + } } catch (e) { if (alertCount < 2) { notifications.notify( @@ -2035,9 +2051,9 @@ const dreamTool = () => "outpainting_fill", "Outpaint Type", { - 0: "fill (SDXL?)", - 1: "original (SDXL?)", - 2: "latent noise (SD1.x/2.x)", + 0: "fill", + 1: "original", + 2: "latent noise (suggested)", 3: "latent nothing", }, 2, // AVOID ORIGINAL FOR OUTPAINT OR ELSE but we still give you the option because we love you and because it seems to work better for SDXL diff --git a/pages/configuration.html b/pages/configuration.html index 4d93605..6590c04 100644 --- a/pages/configuration.html +++ b/pages/configuration.html @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + @@ -142,6 +142,24 @@ onchange="changeSmoothRendering()" /> + + + Button Updates Prompt + + + + + + Jump to 1st New on + + + + +