From 2023aeef97bf12c93fa1c109f7653f62eaf8e35d Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Tue, 14 Jan 2014 14:03:10 +0800 Subject: [PATCH] Use screen module to get screen's available size. In Chrome31 the window.screen.availHeight and availWidth are sometimes 0, this is a workaround of this bug. --- src/atom.coffee | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/atom.coffee b/src/atom.coffee index bab3cd0e6..4be78d895 100644 --- a/src/atom.coffee +++ b/src/atom.coffee @@ -4,6 +4,7 @@ keytar = require 'keytar' os = require 'os' path = require 'path' remote = require 'remote' +screen = require 'screen' shell = require 'shell' dialog = remote.require 'dialog' app = remote.require 'app' @@ -207,10 +208,11 @@ class Atom extends Model # Private: restoreWindowDimensions: -> + workAreaSize = screen.getPrimaryDisplay().workAreaSize windowDimensions = @state.windowDimensions ? {} {initialSize} = @getLoadSettings() - windowDimensions.height ?= initialSize?.height ? global.screen.availHeight - windowDimensions.width ?= initialSize?.width ? Math.min(global.screen.availWidth, 1024) + windowDimensions.height ?= initialSize?.height ? workAreaSize.height + windowDimensions.width ?= initialSize?.width ? Math.min(workAreaSize.width, 1024) @setWindowDimensions(windowDimensions) # Private: