From 105224415e2d62c1b455c94a733e2eaa6558a51a Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Tue, 20 Nov 2018 20:30:26 +0800
Subject: [PATCH] ViewMap Whole BigMap

---
 libs/actions.js | 10 ++++++++++
 libs/ui.js      | 31 ++++++++++++++++++++++++++-----
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/libs/actions.js b/libs/actions.js
index d43972f8..7dd8c71c 100644
--- a/libs/actions.js
+++ b/libs/actions.js
@@ -930,6 +930,11 @@ actions.prototype.clickViewMaps = function (x,y) {
         core.ui.drawMaps(index, cx, cy);
         return;
     }
+    if (x==12 && y==0) {
+        core.status.event.data.all = !core.status.event.data.all;
+        core.ui.drawMaps(index, cx, cy);
+        return;
+    }
 
     if (x>=2 && x<=10 && y<=1 && mh>13) {
         core.ui.drawMaps(index, cx, cy-1);
@@ -1002,6 +1007,11 @@ actions.prototype.keyUpViewMaps = function (keycode) {
         core.ui.drawMaps(core.status.event.data);
         return;
     }
+    if (keycode==90) {
+        core.status.event.data.all = !core.status.event.data.all;
+        core.ui.drawMaps(core.status.event.data);
+        return;
+    }
     if (keycode==77) {
         core.status.event.data.paint = !core.status.event.data.paint;
         core.ui.drawMaps(core.status.event.data);
diff --git a/libs/ui.js b/libs/ui.js
index fcaf5936..70ef4b41 100644
--- a/libs/ui.js
+++ b/libs/ui.js
@@ -1642,8 +1642,10 @@ ui.prototype.drawMaps = function (index, x, y) {
     core.setOpacity('animate', 1);
 
     var damage = (core.status.event.data||{}).damage, paint =  (core.status.event.data||{}).paint;
+    var all = (core.status.event.data||{}).all;
     if (core.isset(index.damage)) damage=index.damage;
     if (core.isset(index.paint)) paint=index.paint;
+    if (core.isset(index.all)) all=index.all;
 
     if (core.isset(index.index)) {
         x=index.x;
@@ -1661,7 +1663,7 @@ ui.prototype.drawMaps = function (index, x, y) {
     if (y<6) y=6;
     if (y>mh-7) y=mh-7;
 
-    core.status.event.data = {"index": index, "x": x, "y": y, "damage": damage, "paint": paint};
+    core.status.event.data = {"index": index, "x": x, "y": y, "damage": damage, "paint": paint, "all": all};
 
     clearTimeout(core.interval.tipAnimate);
     core.clearMap('ui');
@@ -1683,7 +1685,7 @@ ui.prototype.drawMaps = function (index, x, y) {
     core.setFont('data', '16px Arial');
 
     var text = core.status.maps[floorId].title;
-    if (mw>13 || mh>13) text+=" ["+(x-6)+","+(y-6)+"]";
+    if (!all && (mw>13 || mh>13)) text+=" ["+(x-6)+","+(y-6)+"]";
     var textX = 16, textY = 18, width = textX + core.canvas.data.measureText(text).width + 16, height = 42;
     core.fillRect('data', 5, 5, width, height, '#000');
     core.setOpacity('data', 0.4);
@@ -2199,9 +2201,28 @@ ui.prototype.drawThumbnail = function(floorId, canvas, blocks, x, y, size, cente
     if (!core.isset(centerX)) centerX=parseInt(mw/2);
     if (!core.isset(centerY)) centerY=parseInt(mh/2);
 
-    var offsetX = core.clamp(centerX-6, 0, mw-13), offsetY = core.clamp(centerY-6, 0, mh-13);
-    // offsetX~offsetX+12; offsetY~offsetY+12
-    core.canvas[canvas].drawImage(tempCanvas.canvas, offsetX*32, offsetY*32, 416, 416, x, y, size, size);
+    // 如果是浏览地图的全模式
+    if (core.status.event.id=='viewMaps' && (core.status.event.data||{}).all) {
+        if (tempWidth<=tempHeight) {
+            var realHeight = 416, realWidth = realHeight * tempWidth / tempHeight;
+            var side = (416 - realWidth) / 2;
+            core.fillRect(canvas, 0, 0, side, realHeight, '#000000');
+            core.fillRect(canvas, 416-side, 0, side, realHeight);
+            core.canvas[canvas].drawImage(tempCanvas.canvas, 0, 0, tempWidth, tempHeight, side, 0, realWidth, realHeight);
+        }
+        else {
+            var realWidth = 416, realHeight = realWidth * tempHeight / tempWidth;
+            var side = (416 - realHeight) / 2;
+            core.fillRect(canvas, 0, 0, realWidth, side, '#000000');
+            core.fillRect(canvas, 0, 416-side, realWidth, side);
+            core.canvas[canvas].drawImage(tempCanvas.canvas, 0, 0, tempWidth, tempHeight, 0, side, realWidth, realHeight);
+        }
+    }
+    else {
+        var offsetX = core.clamp(centerX-6, 0, mw-13), offsetY = core.clamp(centerY-6, 0, mh-13);
+        // offsetX~offsetX+12; offsetY~offsetY+12
+        core.canvas[canvas].drawImage(tempCanvas.canvas, offsetX*32, offsetY*32, 416, 416, x, y, size, size);
+    }
 }
 
 ui.prototype.drawKeyBoard = function () {