Update Picviewer CE+.user.js

Author: hoothin

Picviewer CE+/Picviewer CE+.user.js

@@ -12,7 +12,7 @@
 // @description:ja       画像を強力に閲覧できるツール。ポップアップ表示、拡大・縮小、回転、一括保存などの機能を自動で実行できます
 // @description:pt-BR    Poderosa ferramenta de visualização de imagens on-line, que pode pop-up/dimensionar/girar/salvar em lote imagens automaticamente
 // @description:ru       Мощный онлайн-инструмент для просмотра изображений, который может автоматически отображать/масштабировать/вращать/пакетно сохранять изображения
-// @version              2025.8.22.1
+// @version              2025.8.29.1
 // @icon                 data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAMAAADXqc3KAAAAV1BMVEUAAAD////29vbKysoqKioiIiKysrKhoaGTk5N9fX3z8/Pv7+/r6+vk5OTb29vOzs6Ojo5UVFQzMzMZGRkREREMDAy4uLisrKylpaV4eHhkZGRPT08/Pz/IfxjQAAAAgklEQVQoz53RRw7DIBBAUb5pxr2m3/+ckfDImwyJlL9DDzQgDIUMRu1vWOxTBdeM+onApENF0qHjpkOk2VTwLVEF40Kbfj1wK8AVu2pQA1aBBYDHJ1wy9Cf4cXD5chzNAvsAnc8TjoLAhIzsBao9w1rlVTIvkOYMd9nm6xPi168t9AYkbANdajpjcwAAAABJRU5ErkJggg==
 // @namespace            https://github.com/hoothin/UserScripts
 // @homepage             https://github.com/hoothin/UserScripts/tree/master/Picviewer%20CE%2B
@@ -25323,6 +25323,32 @@ ImgOps | https://imgops.com/#b#`;
                     };
                 }
             }
+            var checkUniqueImgWin = function() {
+                if (canPreview) {
+                    if (result.type != "link" && result.type != "rule" && result.src == result.imgSrc) {
+                        if (result.imgAS.w < result.imgCS.w * 1.6 && result.imgAS.h < result.imgCS.h * 1.6) {
+                            if (result.img && result.img.childElementCount) {
+                                if (result.type == "force") return false;
+                                if (prefs.floatBar.globalkeys.invertInitShow) return false;
+                            }
+                            var wSize = getWindowSize();
+                            if (prefs.floatBar.globalkeys.invertInitShow && result.imgAS.w <= wSize.w && result.imgAS.h <= wSize.h) return false;
+                        }
+                    }
+                    uniqueImgWinInitX = clientX;
+                    uniqueImgWinInitY = clientY;
+                    if (uniqueImgWin && !uniqueImgWin.removed) {
+                        if (uniqueImgWin.src == result.src) return true;
+                        uniqueImgWin.remove();
+                    }
+                    waitUntilMove(_target, () => {
+                        new LoadingAnimC(result, 'popup', prefs.waitImgLoad, prefs.framesPicOpenInTopWindow);
+                    });
+                    return true;
+                } else {
+                    return false;
+                }
+            };
             if (!result) {
                 if (target.nodeName.toUpperCase() != 'IMG' && target.dataset.role == "img") {
                     let img = target.parentNode.querySelector('img');
@@ -25340,13 +25366,34 @@ ImgOps | https://imgops.com/#b#`;
                         };
                     }
                 } else if (target.nodeName.toUpperCase() != 'IMG') {
+                    if (selectionClientRect &&
+                        clientX > selectionClientRect.left &&
+                        clientX < selectionClientRect.left + selectionClientRect.width &&
+                        clientY > selectionClientRect.top &&
+                        clientY < selectionClientRect.top + selectionClientRect.height) {
+                        result = {
+                            src: selectionStr,
+                            type: "link",
+                            imgSrc: selectionStr,
+                            noActual:true,
+                            img: target
+                        };
+                        checkUniqueImgWin();
+
+                        if (!floatBar) {
+                            floatBar = new FloatBarC();
+                        }
+                        floatBar.start(result);
+
+                        return;
+                    }
                     let found = false;
                     if (target.nodeName.toUpperCase() == "AREA") target = target.parentNode;
                     var broEle, broImg;
                     if (target.nodeName.toUpperCase() != 'A' && target.parentNode && target.parentNode.style && !/flex|grid|table/.test(getComputedStyle(target.parentNode).display)) {
                         broEle = target.previousElementSibling;
                         while (broEle) {
-                            if (broEle.offsetWidth) {
+                            if (broEle.offsetWidth && broEle.offsetWidth > target.offsetWidth>>1) {
                                 if (broEle.nodeName == "IMG") broImg = broEle;
                                 else if (broEle.nodeName == "PICTURE") broImg = broEle.querySelector("img");
                             }
@@ -25357,7 +25404,7 @@ ImgOps | https://imgops.com/#b#`;
                         else if (!broEle) {
                             broEle = target.nextElementSibling;
                             while (broEle) {
-                                if (broEle.offsetWidth) {
+                                if (broEle.offsetWidth && broEle.offsetWidth > target.offsetWidth>>1) {
                                     if (broEle.nodeName == "IMG") broImg = broEle;
                                     else if (broEle.nodeName == "PICTURE") broImg = broEle.querySelector("img");
                                 }
@@ -25582,56 +25629,8 @@ ImgOps | https://imgops.com/#b#`;
                     }
                 }
             }
-            var checkUniqueImgWin = function() {
-                if (canPreview) {
-                    if (result.type != "link" && result.type != "rule" && result.src == result.imgSrc) {
-                        if (result.imgAS.w < result.imgCS.w * 1.6 && result.imgAS.h < result.imgCS.h * 1.6) {
-                            if (result.img && result.img.childElementCount) {
-                                if (result.type == "force") return false;
-                                if (prefs.floatBar.globalkeys.invertInitShow) return false;
-                            }
-                            var wSize = getWindowSize();
-                            if (prefs.floatBar.globalkeys.invertInitShow && result.imgAS.w <= wSize.w && result.imgAS.h <= wSize.h) return false;
-                        }
-                    }
-                    uniqueImgWinInitX = clientX;
-                    uniqueImgWinInitY = clientY;
-                    if (uniqueImgWin && !uniqueImgWin.removed) {
-                        if (uniqueImgWin.src == result.src) return true;
-                        uniqueImgWin.remove();
-                    }
-                    waitUntilMove(_target, () => {
-                        new LoadingAnimC(result, 'popup', prefs.waitImgLoad, prefs.framesPicOpenInTopWindow);
-                    });
-                    return true;
-                } else {
-                    return false;
-                }
-            };
 
             if (!result && target.nodeName.toUpperCase() != 'IMG') {
-                if (selectionClientRect &&
-                    clientX > selectionClientRect.left &&
-                    clientX < selectionClientRect.left + selectionClientRect.width &&
-                    clientY > selectionClientRect.top &&
-                    clientY < selectionClientRect.top + selectionClientRect.height) {
-                    result = {
-                        src: selectionStr,
-                        type: "link",
-                        imgSrc: selectionStr,
-                        noActual:true,
-                        img: target
-                    };
-                    checkUniqueImgWin();
-
-                    if (!floatBar) {
-                        floatBar = new FloatBarC();
-                    }
-                    floatBar.start(result);
-
-                    return;
-                }
-
                 let i = 0;
                 while(target) {
                     if (i++ > 5) {