Merge pull request #36686 from Microsoft/tyriar/36502_fine_config_event

Have terminal listen to fine grained events
This commit is contained in:
Daniel Imms authored and GitHub committed 2017-10-23 10:37:05 -07:00
commit 0944c499f4
2 files changed
+10 -2

No files matched your search

@@ -59,7 +59,11 @@ export abstract class TerminalService implements ITerminalService {
this._onInstanceTitleChanged = new Emitter<string>();
this._onInstancesChanged = new Emitter<string>();
this._configurationService.onDidChangeConfiguration(() => this.updateConfig());
this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('terminal.integrated')) {
this.updateConfig();
}
});
lifecycleService.onWillShutdown(event => event.veto(this._onWillShutdown()));
this._terminalFocusContextKey = KEYBINDING_CONTEXT_TERMINAL_FOCUS.bindTo(this._contextKeyService);
this._findWidgetVisible = KEYBINDING_CONTEXT_TERMINAL_FIND_WIDGET_VISIBLE.bindTo(this._contextKeyService);
@@ -74,7 +74,11 @@ export class TerminalPanel extends Panel {
this._terminalService.setContainers(this.getContainer().getHTMLElement(), this._terminalContainer);
this._register(this.themeService.onThemeChange(theme => this._updateTheme(theme)));
this._register(this._configurationService.onDidChangeConfiguration(() => this._updateFont()));
this._register(this._configurationService.onDidChangeConfiguration(e => {
if (e.affectsConfiguration('terminal.integrated') || e.affectsConfiguration('editor.fontFamily')) {
this._updateFont();
}
}));
this._updateFont();
this._updateTheme();