mirror of
https://github.com/pulsar-edit/pulsar.git
synced 2024-09-22 00:19:24 +03:00
Fix bug from merge with PR#10743
This commit is contained in:
parent
285c082ac0
commit
f6ced98be8
@ -615,7 +615,7 @@ class AtomEnvironment extends Model
|
||||
# But after that, e.g., when the window's been reloaded, we want to use the
|
||||
# dimensions we've saved for it.
|
||||
if not @isFirstLoad()
|
||||
dimensions = @state.windowDimensions
|
||||
dimensions = @windowDimensions
|
||||
|
||||
unless @isValidDimensions(dimensions)
|
||||
dimensions = @getDefaultWindowDimensions()
|
||||
@ -648,18 +648,18 @@ class AtomEnvironment extends Model
|
||||
@registerDefaultTargetForKeymaps()
|
||||
|
||||
@packages.loadPackages()
|
||||
@loadState().then =>
|
||||
@document.body.appendChild(@views.getView(@workspace))
|
||||
|
||||
@watchProjectPath()
|
||||
@document.body.appendChild(@views.getView(@workspace))
|
||||
|
||||
@packages.activate()
|
||||
@keymaps.loadUserKeymap()
|
||||
@requireUserInitScript() unless @getLoadSettings().safeMode
|
||||
@watchProjectPath()
|
||||
|
||||
@menu.update()
|
||||
@packages.activate()
|
||||
@keymaps.loadUserKeymap()
|
||||
@requireUserInitScript() unless @getLoadSettings().safeMode
|
||||
|
||||
@openInitialEmptyEditorIfNecessary()
|
||||
@menu.update()
|
||||
|
||||
@openInitialEmptyEditorIfNecessary()
|
||||
|
||||
serialize: ->
|
||||
version: @constructor.version
|
||||
@ -846,6 +846,8 @@ class AtomEnvironment extends Model
|
||||
|
||||
@setFullScreen(state.fullScreen)
|
||||
|
||||
@windowDimensions = state.windowDimensions if state.windowDimensions
|
||||
|
||||
@packages.packageStates = state.packageStates ? {}
|
||||
|
||||
startTime = Date.now()
|
||||
|
@ -23,9 +23,9 @@ module.exports = ({blobStore}) ->
|
||||
enablePersistence: true
|
||||
})
|
||||
|
||||
atom.loadStateSync()
|
||||
atom.displayWindow()
|
||||
atom.startEditorWindow().then ->
|
||||
atom.loadState().then ->
|
||||
atom.displayWindow()
|
||||
atom.startEditorWindow()
|
||||
|
||||
# Workaround for focus getting cleared upon window creation
|
||||
windowFocused = ->
|
||||
|
Loading…
Reference in New Issue
Block a user