fix

Author: hoothin

Picviewer CE+/Picviewer CE+.user.js

@@ -6,7 +6,7 @@
 // @description    Powerful picture viewing tool online, which can popup/scale/rotate/batch save pictures or find the HD original picture automatically
 // @description:zh-CN    NLF 的围观图修改版，增加高清原图查找显示（在线看图工具，支持图片翻转、旋转、缩放、弹出大图、批量保存、查找原图）
 // @description:zh-TW    NLF 的圍觀圖修改版，增加高清原圖查詢顯示（線上看圖工具，支援圖片翻轉、旋轉、縮放、彈出大圖、批量儲存、查詢原圖）
-// @version        2016.12.16.1
+// @version        2016.12.23.1
 // @created        2011-6-15
 // @namespace      http://userscripts.org/users/NLF
 // @homepage       http://hoothin.com
@@ -5334,23 +5334,22 @@ background-color:rgba(255, 0, 0, 0.150);\
                 imgWindow.style.left=-5 + scrolled.x + 'px';
                 imgWindow.style.top=-5 + scrolled.y + 'px';
 
-                if(prefs.imgWindow.fitToScreen){
+                //window的尺寸
+                var wSize=getWindowSize();
+                //空隙
+                wSize.h -= 16;
+                wSize.w -= 16;
+
+                var imgWindowCS=unsafeWindow.getComputedStyle(imgWindow);
+
+                var rectSize={
+                    h:parseFloat(imgWindowCS.height),
+                    w:parseFloat(imgWindowCS.width),
+                };
+                if(prefs.imgWindow.fitToScreen && !(rectSize.h/rectSize.w > 3.5 && rectSize.h > wSize.h)){
                     this.fitToScreen();
                     this.center(true,true);
                 }else{
-                    //window的尺寸
-                    var wSize=getWindowSize();
-                    //空隙
-                    wSize.h -= 16;
-                    wSize.w -= 16;
-
-                    var imgWindowCS=unsafeWindow.getComputedStyle(imgWindow);
-
-                    var rectSize={
-                        h:parseFloat(imgWindowCS.height),
-                        w:parseFloat(imgWindowCS.width),
-                    };
-
                     this.center(rectSize.w <= wSize.w , rectSize.h <= wSize.h);
                 };