Merge remote-tracking branch 'origin/master' into mb-custom-extension-grammar-map

keymaps/darwin.cson

@@ -181,6 +181,10 @@
   'cmd-k cmd-8': 'editor:fold-at-indent-level-8'
   'cmd-k cmd-9': 'editor:fold-at-indent-level-9'
 
+'atom-workspace atom-pane':
+  'cmd-alt-=': 'pane:increase-size'
+  'cmd-alt--': 'pane:decrease-size'
+
 # allow standard input fields to work correctly
 'body .native-key-bindings':
   'cmd-z': 'native!'

keymaps/linux.cson

@@ -143,6 +143,10 @@
   'ctrl-k ctrl-8': 'editor:fold-at-indent-level-8'
   'ctrl-k ctrl-9': 'editor:fold-at-indent-level-9'
 
+'atom-workspace atom-pane':
+  'ctrl-alt-=': 'pane:increase-size'
+  'ctrl-alt--': 'pane:decrease-size'
+
 # allow standard input fields to work correctly
 'body .native-key-bindings':
   'ctrl-z': 'native!'

keymaps/win32.cson

@@ -147,6 +147,10 @@
   'ctrl-k ctrl-8': 'editor:fold-at-indent-level-8'
   'ctrl-k ctrl-9': 'editor:fold-at-indent-level-9'
 
+'atom-workspace atom-pane':
+  'ctrl-alt-=': 'pane:increase-size'
+  'ctrl-alt--': 'pane:decrease-size'
+
 # allow standard input fields to work correctly
 'body .native-key-bindings':
   'ctrl-z': 'native!'

package.json

@@ -76,7 +76,7 @@
     "one-light-ui": "1.0.3",
     "solarized-dark-syntax": "0.38.1",
     "solarized-light-syntax": "0.22.1",
-    "about": "1.0.1",
+    "about": "1.1.0",
     "archive-view": "0.58.0",
     "autocomplete-atom-api": "0.9.2",
     "autocomplete-css": "0.10.1",
@@ -111,7 +111,7 @@
     "settings-view": "0.213.1",
     "snippets": "0.95.0",
     "spell-check": "0.59.0",
-    "status-bar": "0.75.1",
+    "status-bar": "0.77.0",
     "styleguide": "0.44.0",
     "symbols-view": "0.100.0",
     "tabs": "0.82.0",

spec/pane-container-element-spec.coffee

@@ -160,3 +160,37 @@ describe "PaneContainerElement", ->
       element = getResizeElement(0)
       element.remove()
       expect(-> element.resizeToFitContent()).not.toThrow()
+
+  describe "pane resizing", ->
+    [leftPane, rightPane] = []
+
+    beforeEach ->
+      container = new PaneContainer
+      leftPane = container.getActivePane()
+      rightPane = leftPane.splitRight()
+
+    describe "when pane:increase-size is triggered", ->
+      it "increases the size of the pane", ->
+        expect(leftPane.getFlexScale()).toBe 1
+        expect(rightPane.getFlexScale()).toBe 1
+
+        atom.commands.dispatch(atom.views.getView(leftPane), 'pane:increase-size')
+        expect(leftPane.getFlexScale()).toBe 1.1
+        expect(rightPane.getFlexScale()).toBe 1
+
+        atom.commands.dispatch(atom.views.getView(rightPane), 'pane:increase-size')
+        expect(leftPane.getFlexScale()).toBe 1.1
+        expect(rightPane.getFlexScale()).toBe 1.1
+
+    describe "when pane:decrease-size is triggered", ->
+      it "decreases the size of the pane", ->
+        expect(leftPane.getFlexScale()).toBe 1
+        expect(rightPane.getFlexScale()).toBe 1
+
+        atom.commands.dispatch(atom.views.getView(leftPane), 'pane:decrease-size')
+        expect(leftPane.getFlexScale()).toBe 1/1.1
+        expect(rightPane.getFlexScale()).toBe 1
+
+        atom.commands.dispatch(atom.views.getView(rightPane), 'pane:decrease-size')
+        expect(leftPane.getFlexScale()).toBe 1/1.1
+        expect(rightPane.getFlexScale()).toBe 1/1.1

src/pane-element.coffee

@@ -158,5 +158,7 @@ atom.commands.add 'atom-pane',
   'pane:split-down': -> @getModel().splitDown(copyActiveItem: true)
   'pane:close': -> @getModel().close()
   'pane:close-other-items': -> @getModel().destroyInactiveItems()
+  'pane:increase-size': -> @getModel().increaseSize()
+  'pane:decrease-size': -> @getModel().decreaseSize()
 
 module.exports = PaneElement = document.registerElement 'atom-pane', prototype: PaneElement.prototype

src/pane.coffee

@@ -73,6 +73,11 @@ class Pane extends Model
     @flexScale
 
   getFlexScale: -> @flexScale
+
+  increaseSize: -> @setFlexScale(@getFlexScale() * 1.1)
+
+  decreaseSize: -> @setFlexScale(@getFlexScale() / 1.1)
+
   ###
   Section: Event Subscription
   ###