Merge pull request #11345 from atom/as-fix-pinch-to-zoom

Disable zoom every time a display gets added or removed

src/application-delegate.coffee

@@ -1,5 +1,5 @@
 _ = require 'underscore-plus'
-{ipcRenderer, remote, shell, webFrame} = require 'electron'
+{screen, ipcRenderer, remote, shell, webFrame} = require 'electron'
 ipcHelpers = require './ipc-helpers'
 {Disposable} = require 'event-kit'
 {getWindowLoadSettings, setWindowLoadSettings} = require './window-load-settings-helpers'
@@ -241,8 +241,19 @@ class ApplicationDelegate
   openExternal: (url) ->
     shell.openExternal(url)
 
-  disablePinchToZoom: ->
-    webFrame.setZoomLevelLimits(1, 1)
+  disableZoom: ->
+    outerCallback = ->
+      webFrame.setZoomLevelLimits(1, 1)
+
+    outerCallback()
+    # Set the limits every time a display is added or removed, otherwise the
+    # configuration gets reset to the default, which allows zooming the
+    # webframe.
+    screen.on('display-added', outerCallback)
+    screen.on('display-removed', outerCallback)
+    new Disposable ->
+      screen.removeListener('display-added', outerCallback)
+      screen.removeListener('display-removed', outerCallback)
 
   checkForUpdate: ->
     ipcRenderer.send('command', 'application:check-for-update')

src/atom-environment.coffee

@@ -208,7 +208,7 @@ class AtomEnvironment extends Model
     @stylesElement = @styles.buildStylesElement()
     @document.head.appendChild(@stylesElement)
 
-    @applicationDelegate.disablePinchToZoom()
+    @disposables.add(@applicationDelegate.disableZoom())
 
     @keymaps.subscribeToFileReadFailure()
     @keymaps.loadBundledKeymaps()