This commit is contained in:
Corey Johnson
2013-02-27 08:51:51 -08:00
parent 9454cce157
commit c2c4d03c2d
4 changed files with 12 additions and 14 deletions

View File

@@ -206,14 +206,6 @@
}
}
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
if (!_filesOpened && [self shouldOpenFiles]) {
NSString *path = [self.arguments objectForKey:@"path"];
NSNumber *pid = [self.arguments objectForKey:@"wait"] ? [self.arguments objectForKey:@"pid"] : nil;
[self open:path pidToKillWhenWindowCloses:pid];
}
}
- (void)applicationWillFinishLaunching:(NSNotification *)notification {
NSString *version = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
_versionMenuItem.title = [NSString stringWithFormat:@"Version %@", version];
@@ -235,6 +227,14 @@
}
}
- (void)applicationDidFinishLaunching:(NSNotification *)notification {
if (!_filesOpened && [self shouldOpenFiles]) {
NSString *path = [self.arguments objectForKey:@"path"];
NSNumber *pid = [self.arguments objectForKey:@"wait"] ? [self.arguments objectForKey:@"pid"] : nil;
[self open:path pidToKillWhenWindowCloses:pid];
}
}
- (void)applicationWillTerminate:(NSNotification *)notification {
for (NSWindow *window in [self windows]) {
[window performClose:self];

View File

@@ -9,7 +9,7 @@ $ = require 'jquery'
_ = require 'underscore'
fs = require 'fs'
describe "Editor", ->
fdescribe "Editor", ->
[buffer, editor, cachedLineHeight] = []
getLineHeight = ->

View File

@@ -746,7 +746,7 @@ class Editor extends View
styleTag = $$ -> @style class: 'font-size'
headTag.append styleTag
styleTag.text(".editor {font-size: #{fontSize}px}")
styleTag.text(".editor {font-size: #{fontSize}pt}")
if @isOnDom()
@redraw()
@@ -1362,8 +1362,6 @@ class Editor extends View
lines.push "#{firstRenderedScreenRow + n}: #{$(this).text()}"
lines.join('\n')
logScreenLines: (start, end) ->
@activeEditSession.logScreenLines(start, end)
logRenderedLines: ->
@renderedLines.find('.line').each (n) ->

View File

@@ -47,11 +47,11 @@ class RootView extends View
@setTitle("untitled")
@command 'window:increase-font-size', =>
config.set("editor.fontSize", config.get("editor.fontSize") + 1)
config.set("editor.fontSize", config.get("editor.fontSize") + 2)
@command 'window:decrease-font-size', =>
fontSize = config.get "editor.fontSize"
config.set("editor.fontSize", fontSize - 1) if fontSize > 1
config.set("editor.fontSize", fontSize - 2) if fontSize > 2
@command 'window:focus-next-pane', => @focusNextPane()