From f03dbb998c7e2b05e8844b75d29a0ea8f0ff124b Mon Sep 17 00:00:00 2001
From: kekee000 <kekee000@126com>
Date: Tue, 25 Nov 2014 22:55:35 +0800
Subject: [PATCH] add meta key support

---
 src/fonteditor/dialog/setting-editor.js | 8 +++++---
 src/fonteditor/widget/glyfviewer.js     | 3 ++-
 src/fonteditor/widget/program.js        | 2 ++
 src/render/capture/Keyboard.js          | 2 +-
 src/render/capture/Mouse.js             | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/fonteditor/dialog/setting-editor.js b/src/fonteditor/dialog/setting-editor.js
index 7ab24db..dbd9965 100644
--- a/src/fonteditor/dialog/setting-editor.js
+++ b/src/fonteditor/dialog/setting-editor.js
@@ -14,9 +14,11 @@ define(
 
         var tpl = ''
             + '<div class="form-inline">'
-            +   '<div class="input-group input-group-sm">'
-            +     '<span class="input-group-addon">字体列表颜色</span>'
-            +     '<input data-field="viewer.color" type="text" class="form-control">'
+            +   '<div class="form-group">'
+            +       '<div class="input-group input-group-sm">'
+            +         '<span class="input-group-addon">字体列表颜色</span>'
+            +         '<input data-field="viewer.color" type="text" class="form-control">'
+            +       '</div>'
             +   '</div>'
             + '</div>'
             + '<hr>'
diff --git a/src/fonteditor/widget/glyfviewer.js b/src/fonteditor/widget/glyfviewer.js
index f686bb1..a534694 100644
--- a/src/fonteditor/widget/glyfviewer.js
+++ b/src/fonteditor/widget/glyfviewer.js
@@ -158,7 +158,8 @@ define(
         // 按下事件
         function downlistener(e) {
             var me = this;
-
+            e.ctrlKey = e.ctrlKey || e.metaKey;
+            
             if (me.listening) {
                 // 阻止ctrl+A默认事件
                  if (65 === e.keyCode && e.ctrlKey) {
diff --git a/src/fonteditor/widget/program.js b/src/fonteditor/widget/program.js
index 7128d4d..424b6a4 100644
--- a/src/fonteditor/widget/program.js
+++ b/src/fonteditor/widget/program.js
@@ -50,6 +50,8 @@ define(
                 if (!program.listening) {
                     return;
                 }
+                
+                e.ctrlKey = e.ctrlKey || e.metaKey;
 
                 // 全选
                 if (65 === e.keyCode && e.ctrlKey) {
diff --git a/src/render/capture/Keyboard.js b/src/render/capture/Keyboard.js
index e0db9ef..0f0c0d9 100644
--- a/src/render/capture/Keyboard.js
+++ b/src/render/capture/Keyboard.js
@@ -44,7 +44,7 @@ define(
             return {
                 keyCode: e.keyCode,
                 key: keyCodeMap[e.keyCode],
-                ctrlKey: e.ctrlKey,
+                ctrlKey: e.ctrlKey || e.metaKey,
                 metaKey: e.metaKey,
                 altKey: e.altKey,
                 shiftKey: e.shiftKey,
diff --git a/src/render/capture/Mouse.js b/src/render/capture/Mouse.js
index 38f02a3..0f0a2ad 100644
--- a/src/render/capture/Mouse.js
+++ b/src/render/capture/Mouse.js
@@ -45,7 +45,7 @@ define(
                 x: getX(e),
                 y: getY(e),
                 which: e.which,
-                ctrlKey: e.ctrlKey,
+                ctrlKey: e.ctrlKey || e.metaKey,
                 metaKey: e.metaKey,
                 altKey: e.altKey,
                 shiftKey: e.shiftKey,