github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-04-28 03:01:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13667 from atom/as-fix-ctrl-wheel-change-font-size

Browse Source 
Fix increasing/decreasing font size via ctrl-mousewheel
This commit is contained in:
Antonio Scandurra
2017-01-20 14:49:19 +01:00
committed by GitHub
parent 8154510383 1af1400911
commit 62d804b858
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spec/workspace-element-spec.coffee
View File

@@ -74,14 +74,14 @@ describe "WorkspaceElement", ->
atom.config.set('editor.fontSize', 12)
# Zoom out
editorElement.dispatchEvent(new WheelEvent('mousewheel', {
editorElement.querySelector('span').dispatchEvent(new WheelEvent('mousewheel', {
wheelDeltaY: -10,
ctrlKey: true
}))
expect(atom.config.get('editor.fontSize')).toBe(11)
# Zoom in
editorElement.dispatchEvent(new WheelEvent('mousewheel', {
editorElement.querySelector('span').dispatchEvent(new WheelEvent('mousewheel', {
wheelDeltaY: 10,
ctrlKey: true
}))
@@ -95,13 +95,13 @@ describe "WorkspaceElement", ->
expect(atom.config.get('editor.fontSize')).toBe(12)
# No ctrl key
workspaceElement.dispatchEvent(new WheelEvent('mousewheel', {
editorElement.querySelector('span').dispatchEvent(new WheelEvent('mousewheel', {
wheelDeltaY: 10,
}))
expect(atom.config.get('editor.fontSize')).toBe(12)
atom.config.set('editor.zoomFontWhenCtrlScrolling', false)
editorElement.dispatchEvent(new WheelEvent('mousewheel', {
editorElement.querySelector('span').dispatchEvent(new WheelEvent('mousewheel', {
wheelDeltaY: 10,
ctrlKey: true
}))

2
src/workspace-element.coffee
View File

@@ -102,7 +102,7 @@ class WorkspaceElement extends HTMLElement
getModel: -> @model
handleMousewheel: (event) ->
if event.ctrlKey and @config.get('editor.zoomFontWhenCtrlScrolling') and event.target.matches('atom-text-editor')
if event.ctrlKey and @config.get('editor.zoomFontWhenCtrlScrolling') and event.target.closest('atom-text-editor')?
if event.wheelDeltaY > 0
@model.increaseFontSize()
else if event.wheelDeltaY < 0