From c037efc122066b18e0df8a66a6cb13e05d5c5365 Mon Sep 17 00:00:00 2001
From: mkwiser <kekee000@126com>
Date: Mon, 13 Oct 2014 00:38:46 +0800
Subject: [PATCH] modify scale

---
 src/render/Render.js | 29 +++++++++++++++++------------
 src/ttf/ttf.js       |  8 ++++++++
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/render/Render.js b/src/render/Render.js
index c27c59b..cce10c4 100644
--- a/src/render/Render.js
+++ b/src/render/Render.js
@@ -47,19 +47,24 @@ define(
             if(this.options.enableScale) {
                 var me = this;
                 this.capture.on('wheel', function(e) {
-
-                    var defaultRatio = me.options.defaultRatio || 1.2;
-                    var ratio = e.delta > 0 ?  defaultRatio : 1 / defaultRatio;
-                    var toScale = me.camera.scale * ratio;
-                    if (
-                        toScale < me.options.minScale 
-                        || toScale > me.options.maxScale
-                    ) {
-                        return;
+                    if (e.altKey) {
+                        var defaultRatio = me.options.defaultRatio || 1.2;
+                        var ratio = e.delta > 0 ?  defaultRatio : 1 / defaultRatio;
+                        var toScale = me.camera.scale * ratio;
+                        if (
+                            toScale < me.options.minScale 
+                            || toScale > me.options.maxScale
+                        ) {
+                            return;
+                        }
+                        
+                        me.scale(ratio, e);
+                    }
+                    else {
+                        var moval = e.delta > 0 ? 20 : -20;
+                        me.move(e.shiftKey ? moval : 0, e.shiftKey ? 0 : moval);
+                        me.refresh();
                     }
-                    console.time('refresh');
-                    me.scale(ratio, e);
-                    console.timeEnd('refresh');
                 });
             }
 
diff --git a/src/ttf/ttf.js b/src/ttf/ttf.js
index dfd92d9..eaa78cf 100644
--- a/src/ttf/ttf.js
+++ b/src/ttf/ttf.js
@@ -582,6 +582,14 @@ define(
             });
 
             return {
+
+                // 此处非必须自动设置
+                ascent: usWinAscent,
+                descent: usWinDescent,
+                sTypoAscender: usWinAscent,
+                sTypoDescender: usWinDescent,
+                
+                // 自动设置项目
                 usWinAscent: usWinAscent,
                 usWinDescent: -usWinDescent,
                 sxHeight: sxHeight || 0,