From 90d92a4c920a2935c12420036de30aaa84135df7 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 21 Nov 2013 13:46:54 -0800 Subject: [PATCH 1/3] Upgrade to go-to-line@0.10.0 for atom prefix fixes --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0d67f70d9..9a87208b0 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "gists": "0.9.0", "git-diff": "0.16.0", "github-sign-in": "0.11.0", - "go-to-line": "0.9.0", + "go-to-line": "0.10.0", "grammar-selector": "0.11.0", "image-view": "0.9.0", "keybinding-resolver": "0.5.0", From 2349627e3c95f4dab2600e44133b806a7369ad83 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 21 Nov 2013 13:56:12 -0800 Subject: [PATCH 2/3] Tweak modifier order in spec --- spec/keymap-spec.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/keymap-spec.coffee b/spec/keymap-spec.coffee index a13b8c103..4a2cb8a9f 100644 --- a/spec/keymap-spec.coffee +++ b/spec/keymap-spec.coffee @@ -296,7 +296,7 @@ describe "Keymap", -> expect(keymap.keystrokeStringForEvent(keydownEvent('a', altKey: true))).toBe 'alt-a' expect(keymap.keystrokeStringForEvent(keydownEvent('[', metaKey: true))).toBe 'cmd-[' expect(keymap.keystrokeStringForEvent(keydownEvent('*', ctrlKey: true))).toBe 'ctrl-*' - expect(keymap.keystrokeStringForEvent(keydownEvent('left', ctrlKey: true, metaKey: true, altKey: true))).toBe 'alt-ctrl-cmd-left' + expect(keymap.keystrokeStringForEvent(keydownEvent('left', ctrlKey: true, metaKey: true, altKey: true))).toBe 'alt-cmd-ctrl-left' describe "when shift is pressed when a non-modifer key", -> it "returns a string that identifies the key pressed", -> From c31211dc21e7648e8f4768e877dae8c6948001cb Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 21 Nov 2013 14:50:50 -0800 Subject: [PATCH 3/3] Full screen window after it is shown and focused This prevents a blank menu bar from appearing when opening a window that was previously closed when in full screen mode. Closes #1144 --- src/atom.coffee | 10 ++++++++++ src/root-view.coffee | 3 --- src/window.coffee | 11 +---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index 3c4cc2699..39841c266 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -186,6 +186,16 @@ class Atom hide: -> @getCurrentWindow().hide() + # Private: Schedule the window to be shown and focused on the next tick. + # + # This is done in a next tick to prevent a white flicker from occurring + # if called synchronously. + displayWindow: -> + setImmediate => + @show() + @focus() + @setFullScreen(true) if @rootView.getState().get('fullScreen') + close: -> @getCurrentWindow().close() diff --git a/src/root-view.coffee b/src/root-view.coffee index 261e3ba04..a6b943483 100644 --- a/src/root-view.coffee +++ b/src/root-view.coffee @@ -127,9 +127,6 @@ class RootView extends View @command 'pane:reopen-closed-item', => @panes.reopenItem() - if @state.get('fullScreen') - setImmediate => atom.setFullScreen(true) - # Private: serialize: -> state = @state.clone() diff --git a/src/window.coffee b/src/window.coffee index 579c343ce..014f745fa 100644 --- a/src/window.coffee +++ b/src/window.coffee @@ -8,15 +8,6 @@ WindowEventHandler = require './window-event-handler' windowEventHandler = null -# Schedule the window to be shown and focused on the next tick -# -# This is done in a next tick to prevent a white flicker from occurring -# if called synchronously. -displayWindow = -> - setImmediate -> - atom.show() - atom.focus() - # This method is called in any window needing a general environment, including specs window.setUpEnvironment = (windowMode) -> atom.windowMode = windowMode @@ -58,7 +49,7 @@ window.startEditorWindow = -> unloadEditorWindow() false - displayWindow() + atom.displayWindow() window.unloadEditorWindow = -> return if not atom.project and not atom.rootView