Restore width/height dropdown (#1445)

2023-07-30 06:46:04 +02:00 · 2023-07-30 06:46:04 +02:00 · 2e849827d1
commit 2e849827d1
parent 1e2c9ecb41
5 changed files with 176 additions and 64 deletions
--- a/ui/index.html
+++ b/ui/index.html
@ -192,16 +192,62 @@
                        <a href="https://github.com/easydiffusion/easydiffusion/wiki/How-to-Use#samplers" target="_blank"><i class="fa-solid fa-circle-question help-btn"><span class="simple-tooltip top-left">Click to learn more about samplers</span></i></a>
                    </td></tr>
                    <tr class="pl-5"><td><label>Image Size: </label></td><td id="image-size-options">
-                        <input id="width" name="width" type="number" min="128" value="512" onkeypress="preventNonNumericalInput(event)">
+                        <select id="width" name="width" value="512">
+                            <option value="128">128</option>
+                            <option value="192">192</option>
+                            <option value="256">256</option>
+                            <option value="320">320</option>
+                            <option value="384">384</option>
+                            <option value="448">448</option>
+                            <option value="512" selected="">512 (*)</option>
+                            <option value="576">576</option>
+                            <option value="640">640</option>
+                            <option value="704">704</option>
+                            <option value="768">768 (*)</option>
+                            <option value="832">832</option>
+                            <option value="896">896</option>
+                            <option value="960">960</option>
+                            <option value="1024">1024 (*)</option>
+                            <option value="1280">1280</option>
+                            <option value="1536">1536</option>
+                            <option value="1792">1792</option>
+                            <option value="2048">2048</option>
+                        </select>
                        <label for="width"><small>(width)</small></label>
                        <span id="swap-width-height" class="clickable smallButton" style="margin-left: 2px; margin-right:2px;"><i class="fa-solid fa-right-left"><span class="simple-tooltip top-left"> Swap width and height </span></i></span>
-                        <input id="height" name="height" type="number" min="128" value="512" onkeypress="preventNonNumericalInput(event)">
+                        <select id="height" name="height" value="512">
+                            <option value="128">128</option>
+                            <option value="192">192</option>
+                            <option value="256">256</option>
+                            <option value="320">320</option>
+                            <option value="384">384</option>
+                            <option value="448">448</option>
+                            <option value="512" selected="">512 (*)</option>
+                            <option value="576">576</option>
+                            <option value="640">640</option>
+                            <option value="704">704</option>
+                            <option value="768">768 (*)</option>
+                            <option value="832">832</option>
+                            <option value="896">896</option>
+                            <option value="960">960</option>
+                            <option value="1024">1024 (*)</option>
+                            <option value="1280">1280</option>
+                            <option value="1536">1536</option>
+                            <option value="1792">1792</option>
+                            <option value="2048">2048</option>
+                        </select>
                        <label for="height"><small>(height)</small></label>
                        <div id="recent-resolutions-container">
                            <span id="recent-resolutions-button" class="clickable"><i class="fa-solid fa-sliders"><span class="simple-tooltip top-left"> Recent sizes </span></i></span>
                            <div id="recent-resolutions-popup" class="displayNone">
-                                <small>Upscale:</small><br>
-                                <button id="upscale15" class="tertiaryButton smallButton">×1.5</button>&nbsp;<button id="upscale2" class="tertiaryButton smallButton">×2</button>&nbsp;<button id="upscale3" class="tertiaryButton smallButton">×3</button><br>
+                                <small>Custom size:</small><br>
+                                <input id="custom-width" name="custom-width" type="number" min="128" value="512" onkeypress="preventNonNumericalInput(event)">
+                                &times;
+                                <input id="custom-height" name="custom-height" type="number" min="128" value="512" onkeypress="preventNonNumericalInput(event)"><br>
+
+                                <small>Enlarge:</small><br>
+                                <div id="enlarge-buttons"><button id="enlarge15" class="tertiaryButton smallButton">×1.5</button>&nbsp;<button id="enlarge2" class="tertiaryButton smallButton">×2</button>&nbsp;<button id="enlarge3" class="tertiaryButton smallButton">×3</button></div>
+
                                <small>Recently&nbsp;used:</small><br>
                                <div id="recent-resolution-list">
                                </div>
--- a/ui/media/css/main.css
+++ b/ui/media/css/main.css
@ -1754,7 +1754,7 @@ body.wait-pause {
    font-size: 10pt;
 }

-input#width, input#height {
+input#custom-width, input#custom-height {
    width: 47pt;
 }

@ -1782,6 +1782,18 @@ td#image-size-options small {
    margin-right: 0px !important;
 }

+td#image-size-options {
+    white-space: nowrap;
+}
+
+div#recent-resolution-list {
+    text-align: center;
+}
+
+div#enlarge-buttons {
+    text-align: center;
+}
+
 .clickable {
    cursor: pointer;
 }
--- a/ui/media/js/main.js
+++ b/ui/media/js/main.js
@ -77,12 +77,14 @@ let randomSeedField = document.querySelector("#random_seed")
 let seedField = document.querySelector("#seed")
 let widthField = document.querySelector("#width")
 let heightField = document.querySelector("#height")
+let customWidthField = document.querySelector("#custom-width")
+let customHeightField = document.querySelector("#custom-height")
 let recentResolutionsButton = document.querySelector("#recent-resolutions-button")
 let recentResolutionsPopup = document.querySelector("#recent-resolutions-popup")
 let recentResolutionList = document.querySelector("#recent-resolution-list")
-let upscale15Button = document.querySelector("#upscale15")
-let upscale2Button = document.querySelector("#upscale2")
-let upscale3Button = document.querySelector("#upscale3")
+let enlarge15Button = document.querySelector("#enlarge15")
+let enlarge2Button = document.querySelector("#enlarge2")
+let enlarge3Button = document.querySelector("#enlarge3")
 let swapWidthHeightButton = document.querySelector("#swap-width-height")
 let smallImageWarning = document.querySelector("#small_image_warning")
 let initImageSelector = document.querySelector("#init_image")
@ -2585,14 +2587,49 @@ function roundToMultiple(number, n) {
    return Math.round(number / n) * n;
 }

-function upscaleImageSize(factor) {
-    let step = width.step
-    width.value  = roundToMultiple(width.value*factor, step)
-    height.value = roundToMultiple(height.value*factor, step)
+function addImageSizeOption(size) {
+    let sizes = Object.values(widthField.options).map(o => o.value)
+    if (!sizes.includes(String(size))) {
+        sizes.push(String(size))
+        sizes.sort( (a,b) => Number(a)-Number(b) )
+
+        let option = document.createElement("option")
+        option.value = size
+        option.text = `${size}`
+        
+        widthField.add(option, sizes.indexOf(String(size)))
+        heightField.add(option.cloneNode(true), sizes.indexOf(String(size)))
+    }
+
 }

+function setImageWidthHeight(w,h) {
+    let step = customWidthField.step
+    w = roundToMultiple(w, step)
+    h = roundToMultiple(h, step)

-function makeResolutionButtons() {
+    addImageSizeOption(w)
+    addImageSizeOption(h)
+
+    widthField.value=w
+    heightField.value=h
+    widthField.dispatchEvent(new Event("change"))
+    heightField.dispatchEvent(new Event("change"))
+}
+
+function enlargeImageSize(factor) {
+    let step = customWidthField.step
+
+    let w = roundToMultiple(widthField.value*factor, step)
+    let h = roundToMultiple(heightField.value*factor, step)
+    customWidthField.value = w
+    customHeightField.value = h
+}
+
+let recentResolutionsValues = []
+
+;(function() { ///// Init resolutions dropdown
+    function makeResolutionButtons() {
        recentResolutionList.innerHTML = ""
        recentResolutionsValues.forEach( el => {
            let button = document.createElement("button")
@ -2600,55 +2637,50 @@ function makeResolutionButtons() {
            button.style.width="8em"
            button.innerHTML = `${el.w}&times;${el.h}`
            button.addEventListener("click", () => {
-            width.value=el.w
-            height.value=el.h
-            width.dispatchEvent(new Event("change"))
-            height.dispatchEvent(new Event("change"))
-            recentResolutionsPopup.classList.add("displayNone")
+                customWidthField.value=el.w
+                customHeightField.value=el.h
+                hidePopup()
            })
            recentResolutionList.appendChild(button)
            recentResolutionList.appendChild(document.createElement("br"))
        })
        localStorage.recentResolutionsValues = JSON.stringify(recentResolutionsValues)
-}
+    }

-let recentResolutionsValues = []
-
-;(function() { ///// Init resolutions dropdown
-    upscale15Button.addEventListener("click", () => {
-        upscaleImageSize(1.5)
-        recentResolutionsPopup.classList.add("displayNone")
+    enlarge15Button.addEventListener("click", () => {
+        enlargeImageSize(1.5)
+        hidePopup()
    })

-    upscale2Button.addEventListener("click", () => {
-        upscaleImageSize(2)
-        recentResolutionsPopup.classList.add("displayNone")
+    enlarge2Button.addEventListener("click", () => {
+        enlargeImageSize(2)
+        hidePopup()
    })

-    upscale3Button.addEventListener("click", () => {
-        upscaleImageSize(3)
-        recentResolutionsPopup.classList.add("displayNone")
+    enlarge3Button.addEventListener("click", () => {
+        enlargeImageSize(3)
+        hidePopup()
    })

-    width.addEventListener("change", () => {
-        let w = width.value
-        width.value = roundToMultiple(w, width.step)
-        if (w!=width.value) {
-            showToast(`Rounded width to the closest multiple of ${width.step}.`)
+    customWidthField.addEventListener("change", () => {
+        let w = customWidthField.value
+        customWidthField.value = roundToMultiple(w, customWidthField.step)
+        if (w!=customWidthField.value) {
+            showToast(`Rounded width to the closest multiple of ${customWidthField.step}.`)
        }
    })

-    height.addEventListener("change", () => {
-        let h = height.value
-        height.value = roundToMultiple(h, height.step)
-        if (h!=height.value) {
-            showToast(`Rounded height to the closest multiple of ${height.step}.`)
+    customHeightField.addEventListener("change", () => {
+        let h = customHeightField.value
+        customHeightField.value = roundToMultiple(h, customHeightField.step)
+        if (h!=customHeightField.value) {
+            showToast(`Rounded height to the closest multiple of ${customHeightField.step}.`)
        }
    })

    makeImageBtn.addEventListener("click", () => {
-        let w = width.value
-        let h = height.value
+        let w = widthField.value
+        let h = heightField.value

        recentResolutionsValues = recentResolutionsValues.filter(el => (el.w!=w || el.h!=h))
        recentResolutionsValues.unshift({w: w, h:h})
@ -2675,23 +2707,43 @@ let recentResolutionsValues = []
    }
    makeResolutionButtons()

+    recentResolutionsValues.forEach( val => {
+        addImageSizeOption(val.w)
+        addImageSizeOption(val.h)
+    })
+
    function processClick(e) {
        if (!recentResolutionsPopup.contains(e.target)) {
-            recentResolutionsPopup.classList.add("displayNone")
+            hidePopup()
        }
+    }
+
+    function showPopup() {
+        customWidthField.value = widthField.value
+        customHeightField.value = heightField.value
+        recentResolutionsPopup.classList.remove("displayNone")
+        document.addEventListener("click", processClick)
+    }
+
+    function hidePopup() {
+        recentResolutionsPopup.classList.add("displayNone")
+        setImageWidthHeight(customWidthField.value, customHeightField.value)
        document.removeEventListener("click", processClick)
    }

    recentResolutionsButton.addEventListener("click", (event) => {
-        recentResolutionsPopup.classList.toggle("displayNone")
+        if (recentResolutionsPopup.classList.contains("displayNone")) {
+            showPopup()
            event.stopPropagation()
-        document.addEventListener("click", processClick)
+        } else {
+            hidePopup()
+        }
    })

    swapWidthHeightButton.addEventListener("click", (event) => {
-        let temp = width.value
-        width.value = height.value
-        height.value = temp
+        let temp = widthField.value
+        widthField.value = heightField.value
+        heightField.value = temp
    })
 })()

--- a/ui/media/js/parameters.js
+++ b/ui/media/js/parameters.js
@ -453,8 +453,8 @@ async function getAppConfig() {
            document.querySelectorAll("#sampler_name option.diffusers-only").forEach((option) => {
                option.style.display = "none"
            })
-            width.step=64
-            height.step=64
+            customWidthField.step=64
+            customHeightField.step=64
        } else {
            document.querySelector("#lora_model_container").style.display = ""
            document.querySelector("#tiling_container").style.display = ""
@ -465,8 +465,8 @@ async function getAppConfig() {
            document.querySelector("#clip_skip_config").classList.remove("displayNone")
            document.querySelector("#embeddings-button").classList.remove("displayNone")
            document.querySelector("#negative-embeddings-button").classList.remove("displayNone")
-            width.step=8
-            height.step=8
+            customWidthField.step=8
+            customHeightField.step=8
        }

        console.log("get config status response", config)
--- a/ui/plugins/ui/image-editor-improvements.plugin.js
+++ b/ui/plugins/ui/image-editor-improvements.plugin.js
@ -109,8 +109,10 @@

    imageObj.onload = function() {
        // Calculate the maximum cropped dimensions
-        const maxCroppedWidth = Math.floor(this.width / 64) * 64;
-        const maxCroppedHeight = Math.floor(this.height / 64) * 64;
+        const step = customWidthField.step
+
+        const maxCroppedWidth = Math.floor(this.width / step) * step;
+        const maxCroppedHeight = Math.floor(this.height / step) * step;

        canvas.width = maxCroppedWidth;
        canvas.height = maxCroppedHeight;