From 025c6111b315f19d0f1396abbdf576451b43a7ea Mon Sep 17 00:00:00 2001 From: Ben Ogle Date: Wed, 10 Sep 2014 18:01:45 -0700 Subject: [PATCH] Move global editor stylesheet updating into the ThemeManager --- src/theme-manager.coffee | 16 +++++++++++++++- src/workspace-view.coffee | 17 +++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/src/theme-manager.coffee b/src/theme-manager.coffee index 139103346..42ad5ac02 100644 --- a/src/theme-manager.coffee +++ b/src/theme-manager.coffee @@ -84,7 +84,7 @@ class ThemeManager EmitterMixin::on.apply(this, arguments) ### - Section: Methods + Section: Instance Methods ### getAvailableNames: -> @@ -334,3 +334,17 @@ class ThemeManager @emitter.emit 'did-add-stylesheet', styleElement.sheet @emit 'stylesheets-changed' @emitter.emit 'did-change-stylesheets' + + updateGlobalEditorStyle: (property, value) -> + unless styleNode = @stylesheetElementForId('global-editor-styles') + @applyStylesheet('global-editor-styles', '.editor {}') + styleNode = @stylesheetElementForId('global-editor-styles') + + {sheet} = styleNode + editorRule = sheet.cssRules[0] + editorRule.style[property] = value + + @emit 'stylesheet-updated', sheet + @emitter.emit 'did-update-stylesheet', sheet + @emit 'stylesheets-changed' + @emitter.emit 'did-change-stylesheets' diff --git a/src/workspace-view.coffee b/src/workspace-view.coffee index 067600eb0..0398b42b4 100644 --- a/src/workspace-view.coffee +++ b/src/workspace-view.coffee @@ -373,24 +373,13 @@ class WorkspaceView extends View @model.destroy() setEditorFontSize: (fontSize) => - @setEditorStyle('font-size', fontSize + 'px') + atom.themes.updateGlobalEditorStyle('font-size', fontSize + 'px') setEditorFontFamily: (fontFamily) => - @setEditorStyle('font-family', fontFamily) + atom.themes.updateGlobalEditorStyle('font-family', fontFamily) setEditorLineHeight: (lineHeight) => - @setEditorStyle('line-height', lineHeight) - - setEditorStyle: (property, value) -> - unless styleNode = atom.themes.stylesheetElementForId('global-editor-styles') - atom.themes.applyStylesheet('global-editor-styles', '.editor {}') - styleNode = atom.themes.stylesheetElementForId('global-editor-styles') - - {sheet} = styleNode - editorRule = sheet.cssRules[0] - editorRule.style[property] = value - atom.themes.emit 'stylesheet-updated', sheet - atom.themes.emit 'stylesheets-changed' + atom.themes.updateGlobalEditorStyle('line-height', lineHeight) # Deprecated eachPane: (callback) ->