From bc7906e6d62bb3ed158304c581e941862355f6de Mon Sep 17 00:00:00 2001
From: Danil Boldyrev <daswerq123@gmail.com>
Date: Tue, 8 Aug 2023 21:28:16 +0300
Subject: Ability to automatically expand a picture that does not fit in the
 screen

---
 .../canvas-zoom-and-pan/javascript/zoom.js         | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js')

diff --git a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
index 30199dcd..7369e897 100644
--- a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
+++ b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
@@ -201,7 +201,8 @@ onUiLoaded(async() => {
         canvas_hotkey_overlap: "KeyO",
         canvas_disabled_functions: [],
         canvas_show_tooltip: true,
-        canvas_blur_prompt: false
+        canvas_blur_prompt: false,
+        canvas_auto_expand: false
     };
 
     const functionMap = {
@@ -648,8 +649,34 @@ onUiLoaded(async() => {
             mouseY = e.offsetY;
         }
 
+        // Simulation of the function to put a long image into the screen.
+        // We define the size of the canvas, make a fullscreen to reveal the image, then reduce it to fit into the element.
+        // We hide the image and show it to the user when it is ready.
+        function autoExpand(e) {
+            const canvas = document.querySelector(`${elemId} canvas[key="interface"]`);
+            const isMainTab = activeElement === elementIDs.inpaint || activeElement === elementIDs.inpaintSketch || activeElement === elementIDs.sketch;
+            if (canvas && isMainTab) {
+                if (canvas && parseInt(targetElement.style.width) > 862 || parseInt(canvas.width) < 862) {
+                    return;
+                }
+                if (canvas) {
+                    targetElement.style.visibility = "hidden";
+                    setTimeout(() => {
+                        fitToScreen();
+                        resetZoom();
+                        targetElement.style.visibility = "visible";
+                    }, 10);
+                }
+            }
+        }
+
         targetElement.addEventListener("mousemove", getMousePosition);
 
+        // Apply auto expand if enabled
+        if (hotkeysConfig.canvas_auto_expand) {
+            targetElement.addEventListener("mousemove", autoExpand);
+        }
+
         // Handle events only inside the targetElement
         let isKeyDownHandlerAttached = false;
 
-- 
cgit v1.2.1


From e12a1be1ca23377a3d5774fe8d52664a9c2c0fb9 Mon Sep 17 00:00:00 2001
From: Danil Boldyrev <daswerq123@gmail.com>
Date: Wed, 9 Aug 2023 00:14:19 +0300
Subject: auto-expand enable by default for js

---
 extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js')

diff --git a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
index 7369e897..eb49a01d 100644
--- a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
+++ b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
@@ -201,8 +201,8 @@ onUiLoaded(async() => {
         canvas_hotkey_overlap: "KeyO",
         canvas_disabled_functions: [],
         canvas_show_tooltip: true,
+        canvas_auto_expand: true,
         canvas_blur_prompt: false,
-        canvas_auto_expand: false
     };
 
     const functionMap = {
-- 
cgit v1.2.1


From 4a64d340010a907a6f5a0f53da023c46f794a590 Mon Sep 17 00:00:00 2001
From: Danil Boldyrev <daswerq123@gmail.com>
Date: Wed, 9 Aug 2023 18:40:45 +0300
Subject: fix auto-expand

---
 extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js')

diff --git a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
index eb49a01d..e7616b98 100644
--- a/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
+++ b/extensions-builtin/canvas-zoom-and-pan/javascript/zoom.js
@@ -42,6 +42,11 @@ onUiLoaded(async() => {
         }
     }
 
+    // Detect whether the element has a horizontal scroll bar
+    function hasHorizontalScrollbar(element) {
+        return element.scrollWidth > element.clientWidth;
+    }
+
     // Function for defining the "Ctrl", "Shift" and "Alt" keys
     function isModifierKey(event, key) {
         switch (key) {
@@ -650,16 +655,14 @@ onUiLoaded(async() => {
         }
 
         // Simulation of the function to put a long image into the screen.
-        // We define the size of the canvas, make a fullscreen to reveal the image, then reduce it to fit into the element.
+        // We detect if an image has a scroll bar or not, make a fullscreen to reveal the image, then reduce it to fit into the element.
         // We hide the image and show it to the user when it is ready.
         function autoExpand(e) {
             const canvas = document.querySelector(`${elemId} canvas[key="interface"]`);
             const isMainTab = activeElement === elementIDs.inpaint || activeElement === elementIDs.inpaintSketch || activeElement === elementIDs.sketch;
+
             if (canvas && isMainTab) {
-                if (canvas && parseInt(targetElement.style.width) > 862 || parseInt(canvas.width) < 862) {
-                    return;
-                }
-                if (canvas) {
+                if (hasHorizontalScrollbar(targetElement)) {
                     targetElement.style.visibility = "hidden";
                     setTimeout(() => {
                         fitToScreen();
-- 
cgit v1.2.1