Merge branch 'master' into dh-async-repo

spec/integration/startup-spec.coffee

@@ -125,6 +125,27 @@ describe "Starting Atom", ->
           .treeViewRootDirectories()
           .then ({value}) -> expect(value).toEqual([otherTempDirPath])
 
+    it "opens the new window offset from the other window", ->
+      runAtom [path.join(tempDirPath, "new-file")], {ATOM_HOME: atomHome}, (client) ->
+        win0Position = null
+        win1Position = null
+        client
+          .waitForWindowCount(1, 10000)
+          .execute -> atom.getPosition()
+          .then ({value}) -> win0Position = value
+          .waitForNewWindow(->
+            @startAnotherAtom([path.join(temp.mkdirSync("a-third-dir"), "a-file")], ATOM_HOME: atomHome)
+          , 5000)
+          .waitForWindowCount(2, 10000)
+          .execute -> atom.getPosition()
+          .then ({value}) -> win1Position = value
+          .then ->
+            expect(win1Position.x).toBeGreaterThan(win0Position.x)
+            # Ideally we'd test the y coordinate too, but if the window's
+            # already as tall as it can be, then OS X won't move it down outside
+            # the screen.
+            # expect(win1Position.y).toBeGreaterThan(win0Position.y)
+
   describe "reopening a directory that was previously opened", ->
     it "remembers the state of the window", ->
       runAtom [tempDirPath], {ATOM_HOME: atomHome}, (client) ->

src/browser/atom-application.coffee

@@ -167,7 +167,7 @@ class AtomApplication
       safeMode: @focusedWindow()?.safeMode
 
     @on 'application:quit', -> app.quit()
-    @on 'application:new-window', -> @openPath(_.extend(windowDimensions: @focusedWindow()?.getDimensions(), getLoadSettings()))
+    @on 'application:new-window', -> @openPath(getLoadSettings())
     @on 'application:new-file', -> (@focusedWindow() ? this).openPath()
     @on 'application:open', -> @promptForPathToOpen('all', getLoadSettings())
     @on 'application:open-file', -> @promptForPathToOpen('file', getLoadSettings())
@@ -360,6 +360,23 @@ class AtomApplication
   focusedWindow: ->
     _.find @windows, (atomWindow) -> atomWindow.isFocused()
 
+  # Get the platform-specific window offset for new windows.
+  getWindowOffsetForCurrentPlatform: ->
+    offsetByPlatform =
+      darwin: 22
+      win32: 26
+    offsetByPlatform[process.platform] ? 0
+
+  # Get the dimensions for opening a new window by cascading as appropriate to
+  # the platform.
+  getDimensionsForNewWindow: ->
+    dimensions = (@focusedWindow() ? @lastFocusedWindow)?.getDimensions()
+    offset = @getWindowOffsetForCurrentPlatform()
+    if dimensions? and offset?
+      dimensions.x += offset
+      dimensions.y += offset
+    dimensions
+
   # Public: Opens a single path, in an existing window if possible.
   #
   # options -
@@ -417,6 +434,7 @@ class AtomApplication
 
       windowInitializationScript ?= require.resolve('../initialize-application-window')
       resourcePath ?= @resourcePath
+      windowDimensions ?= @getDimensionsForNewWindow()
       openedWindow = new AtomWindow({locationsToOpen, windowInitializationScript, resourcePath, devMode, safeMode, windowDimensions, profileStartup})
 
     if pidToKillWhenClosed?