mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Make autoresize follow Chrome's behavior

Browse source
This commit is contained in:
Cheng Zhao 2014-10-25 15:48:59 +08:00
parent 69bcc8e831
commit 04f1860bf5
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/lib/guest-view-manager.coffee
View file

@ -56,6 +56,10 @@ createGuest = (embedder, params) ->
guest.on event, (_, args...) -> guest.on event, (_, args...) ->
embedder.send "ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-#{guest.viewInstanceId}", event, args... embedder.send "ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-#{guest.viewInstanceId}", event, args...
# Autosize.
guest.on 'size-changed', (_, args...) ->
embedder.send "ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED", args...
id id
# Destroy an existing guest instance. # Destroy an existing guest instance.

8
atom/renderer/lib/guest-view-internal.coffee
View file

@ -20,13 +20,19 @@ dispatchEvent = (webView, event, args...) ->
domEvent = new Event(event) domEvent = new Event(event)
for f, i in WEB_VIEW_EVENTS[event] for f, i in WEB_VIEW_EVENTS[event]
domEvent[f] = args[i] domEvent[f] = args[i]
webView.webviewNode.dispatchEvent domEvent webView.dispatchEvent domEvent
module.exports = module.exports =
registerEvents: (webView, viewInstanceId) -> registerEvents: (webView, viewInstanceId) ->
ipc.on "ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-#{viewInstanceId}", (event, args...) -> ipc.on "ATOM_SHELL_GUEST_VIEW_INTERNAL_DISPATCH_EVENT-#{viewInstanceId}", (event, args...) ->
dispatchEvent webView, event, args... dispatchEvent webView, event, args...
ipc.on 'ATOM_SHELL_GUEST_VIEW_INTERNAL_SIZE_CHANGED', (args...) ->
domEvent = new Event('size-changed')
for f, i in ['oldWidth', 'oldHeight', 'newWidth', 'newHeight']
domEvent[f] = args[i]
webView.onSizeChanged domEvent
createGuest: (type, params, callback) -> createGuest: (type, params, callback) ->
requestId++ requestId++
ipc.send 'ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', type, params, requestId ipc.send 'ATOM_SHELL_GUEST_VIEW_MANAGER_CREATE_GUEST', type, params, requestId

2
atom/renderer/lib/web-view.coffee
View file

@ -382,7 +382,7 @@ class WebView
@attachWindow guestInstanceId, false @attachWindow guestInstanceId, false
@pendingGuestCreation = true @pendingGuestCreation = true
@dispatchEvent = (webViewEvent) -> dispatchEvent: (webViewEvent) ->
@webviewNode.dispatchEvent webViewEvent @webviewNode.dispatchEvent webViewEvent
# Adds an 'on<event>' property on the webview, which can be used to set/unset # Adds an 'on<event>' property on the webview, which can be used to set/unset