Fontsize

src/brackets.js

@@ -214,6 +214,8 @@ define(function (require, exports, module) {
 
                     // VIEW
                     {"Ctrl-Shift-H": Commands.VIEW_HIDE_SIDEBAR},
+                    {"Ctrl-=": Commands.VIEW_INCREASE_FONT_SIZE},
+                    {"Ctrl--": Commands.VIEW_DECREASE_FONT_SIZE},
 
                     // Navigate
                     {"Ctrl-Shift-O": Commands.NAVIGATE_QUICK_OPEN},

src/command/Commands.js

@@ -62,7 +62,9 @@ define(function (require, exports, module) {
     exports.EDIT_LINE_COMMENT   = "edit.lineComment";
 
     // VIEW
-    exports.VIEW_HIDE_SIDEBAR   = "view.hideSidebar";
+    exports.VIEW_HIDE_SIDEBAR       = "view.hideSidebar";
+    exports.VIEW_INCREASE_FONT_SIZE = "view.increaseFontSize";
+    exports.VIEW_DECREASE_FONT_SIZE = "view.decreaseFontSize";
 
     // Navigate
     exports.NAVIGATE_QUICK_OPEN         = "navigate.quickOpen";

src/command/KeyMap.js

@@ -22,7 +22,7 @@
  */
 
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50, regexp:true */
 /*global define, brackets */
 
 define(function (require, exports, module) {
@@ -35,12 +35,17 @@ define(function (require, exports, module) {
      * @param {boolean} hasAlt Is Alt key enabled
      * @param {boolean} hasShift Is Shift key enabled
      * @param {string} key The key that's pressed
+     * @param {string} origDescriptor The optional original descriptor
      * @return {string} The normalized key descriptor
      */
-    function _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key) {
+    function _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key, origDescriptor) {
         if (!key) {
-            console.log("KeyMap _buildKeyDescriptor() - No key provided!");
-            return "";
+            if (origDescriptor && origDescriptor.search(/^.+--$/) !== -1) { // Check if the binding is for "-"
+                key = "-";
+            } else {
+                console.log("KeyMap _buildKeyDescriptor() - No key provided!");
+                return "";
+            }
         }
 
         var keyDescriptor = [];
@@ -111,7 +116,7 @@ define(function (require, exports, module) {
             }
         });
 
-        return _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key);
+        return _buildKeyDescriptor(hasCtrl, hasAlt, hasShift, key, origDescriptor);
     }
 
     /**

src/styles/brackets_codemirror_override.less

@@ -20,6 +20,15 @@
 
 /* Brackets / CodeMirror Code Formatting */
 
+/*
+ * TODO This can be removed next time we update CodeMirror2.
+ * Marijn made this change to codemirror.css, but I need it now
+ * in order to make font resizing work.
+ */
+.CodeMirror pre {
+    line-height: inherit;
+}
+
 .CodeMirror-scroll {
     background-color: @background-color-3;
 }

src/styles/brackets_theme_default.less

@@ -102,11 +102,9 @@
  */
 .code-font() {
     color: @content-color;
-    pre {
-        // line-height must be specified in px not em because the code font and line number font sizes are different.
-        // Sizing via em will cause the code and line numbers to misalign
-        line-height: 15px;
-    }
+    // line-height must be specified in px not em because the code font and line number font sizes are different.
+    // Sizing via em will cause the code and line numbers to misalign
+    line-height: 15px;
 }
 
 .code-font-win() {

src/view/ViewCommandHandlers.js

@@ -21,7 +21,7 @@
  * 
  */
 
-/*jslint vars: true, plusplus: true, devel: true, nomen: true, indent: 4, maxerr: 50 */
+/*jslint vars: true, plusplus: true, devel: true, browser: true, nomen: true, indent: 4, maxerr: 50 */
 /*global define, $ */
 
 define(function (require, exports, module) {
@@ -30,11 +30,75 @@ define(function (require, exports, module) {
     var Commands                = require("command/Commands"),
         CommandManager          = require("command/CommandManager"),
         SidebarView             = require("project/SidebarView"),
-        ProjectManager          = require("project/ProjectManager");
+        ProjectManager          = require("project/ProjectManager"),
+        EditorManager           = require("editor/EditorManager");
 
     function _handleHideSidebar() {
         SidebarView.toggleSidebar();
     }
 
-    CommandManager.register(Commands.VIEW_HIDE_SIDEBAR, _handleHideSidebar);
+    /**
+     * @private
+     * Increases or decreases the editor's font size.
+     * @param {string} "up" or "down"
+     */
+    function _adjustFontSize(direction) {
+        var styleId = "codemirror-dynamic-fonts";
+
+        var fs = $(".CodeMirror-scroll").css("font-size");
+        var lh = $(".CodeMirror-scroll").css("line-height");
+
+        var fsUnits = fs.substring(fs.length - 2, fs.length);
+        var lhUnits = lh.substring(lh.length - 2, lh.length);
+
+        fs = fs.substring(0, fs.length - 2);
+        lh = lh.substring(0, lh.length - 2);
+
+        var fsDelta = (fsUnits === "px") ? 1 : 0.1;
+        var lhDelta = (lhUnits === "px") ? 1 : 0.1;
+
+        if (direction === "down") {
+            fsDelta *= -1;
+            lhDelta *= -1;
+        }
+
+        var fsStr = (parseFloat(fs) + fsDelta) + fsUnits;
+        var lhStr = (parseFloat(lh) + lhDelta) + lhUnits;
+
+        if (fsStr === "1px" || fsStr === ".1em") {
+            return;
+        }
+
+        $("#" + styleId).remove();
+        var style = window.document.createElement("style");
+        style.setAttribute("type", "text/css");
+        style.setAttribute("id", styleId);
+        style.innerHTML = ".CodeMirror-scroll{font-size:" + fsStr +
+                          " !important;line-height:" + lhStr + " !important;}";
+        $("head").append(style);
+
+        var fullEditor = EditorManager.getCurrentFullEditor();
+        fullEditor._codeMirror.refresh();
+
+        var inlineEditors = fullEditor.getInlineWidgets();
+        inlineEditors.forEach(function (multilineEditor, i, arr) {
+            multilineEditor.sizeInlineWidgetToContents(true);
+            multilineEditor._updateRelatedContainer();
+            multilineEditor.editors.forEach(function (editor, j, arr) {
+                editor._codeMirror.refresh();
+            });
+        });
+    }
+
+    function _handleIncreaseFontSize() {
+        _adjustFontSize("up");
+    }
+
+    function _handleDecreaseFontSize() {
+        _adjustFontSize("down");
+    }
+
+    CommandManager.register(Commands.VIEW_HIDE_SIDEBAR,       _handleHideSidebar);
+    CommandManager.register(Commands.VIEW_INCREASE_FONT_SIZE, _handleIncreaseFontSize);
+    CommandManager.register(Commands.VIEW_DECREASE_FONT_SIZE, _handleDecreaseFontSize);
 });