Merge pull request #6990 from kisstkondoros/zooming

src/vs/editor/browser/controller/mouseHandler.ts

@@ -7,6 +7,7 @@
 import {IDisposable, dispose, Disposable} from 'vs/base/common/lifecycle';
 import * as platform from 'vs/base/common/platform';
 import * as browser from 'vs/base/browser/browser';
+import * as dom from 'vs/base/browser/dom';
 import {Position} from 'vs/editor/common/core/position';
 import {Selection} from 'vs/editor/common/core/selection';
 import * as editorCommon from 'vs/editor/common/editorCommon';
@@ -17,6 +18,8 @@ import {TimeoutTimer} from 'vs/base/common/async';
 import {ViewContext} from 'vs/editor/common/view/viewContext';
 import {VisibleRange} from 'vs/editor/common/view/renderingContext';
 import {EditorMouseEventFactory, GlobalEditorMouseMoveMonitor, EditorMouseEvent} from 'vs/editor/browser/editorDom';
+import {StandardMouseWheelEvent} from 'vs/base/browser/mouseEvent';
+import {EditorZoom} from 'vs/editor/common/config/commonEditorConfig';
 
 /**
  * Merges mouse events when mouse move events are throttled
@@ -163,6 +166,19 @@ export class MouseHandler extends ViewEventHandler implements IDisposable {
 
 		this.listenersToRemove.push(mouseEvents.onMouseDown(this.viewHelper.viewDomNode, (e) => this._onMouseDown(e)));
 
+		let onMouseWheel = (browserEvent: MouseWheelEvent) => {
+			let e = new StandardMouseWheelEvent(browserEvent);
+			if (e.browserEvent.ctrlKey) {
+				let zoomLevel:number = EditorZoom.getZoomLevel();
+				let delta = e.deltaY > 0 ? 1 : -1;
+				EditorZoom.setZoomLevel(zoomLevel + delta);
+				e.preventDefault();
+				e.stopPropagation();
+			}
+		};
+		this.listenersToRemove.push(dom.addDisposableListener(this.viewHelper.viewDomNode, 'mousewheel', onMouseWheel, true));
+		this.listenersToRemove.push(dom.addDisposableListener(this.viewHelper.viewDomNode, 'DOMMouseScroll', onMouseWheel, true));
+
 		this._context.addEventHandler(this);
 	}
 

src/vs/editor/common/config/commonEditorConfig.ts

@@ -16,6 +16,34 @@ import * as editorCommon from 'vs/editor/common/editorCommon';
 import {EditorLayoutProvider} from 'vs/editor/common/viewLayout/editorLayoutProvider';
 import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
 
+export interface IEditorZoom {
+	onDidChangeZoomLevel:Event<number>;
+	getZoomLevel(): number;
+	setZoomLevel(zoomLevel:number): void;
+}
+
+export const EditorZoom: IEditorZoom = new class {
+
+	private _zoomLevel: number = 0;
+
+	private _onDidChangeZoomLevel: Emitter<number> = new Emitter<number>();
+	public onDidChangeZoomLevel:Event<number> = this._onDidChangeZoomLevel.event;
+
+	public getZoomLevel(): number {
+		return this._zoomLevel;
+	}
+
+	public setZoomLevel(zoomLevel:number): void {
+		zoomLevel = Math.min(Math.max(-9, zoomLevel), 9);
+		if (this._zoomLevel === zoomLevel) {
+			return;
+		}
+
+		this._zoomLevel = zoomLevel;
+		this._onDidChangeZoomLevel.fire(this._zoomLevel);
+	}
+};
+
 /**
  * Experimental screen reader support toggle
  */
@@ -353,6 +381,7 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		this._lineCount = 1;
 		this.editor = this._computeInternalOptions();
 		this.editorClone = this.editor.clone();
+		this._register(EditorZoom.onDidChangeZoomLevel(_ => this._recomputeOptions()));
 	}
 
 	public dispose(): void {
@@ -389,6 +418,9 @@ export abstract class CommonEditorConfiguration extends Disposable implements ed
 		if (lineHeight === 0) {
 			lineHeight = Math.round(GOLDEN_LINE_HEIGHT_RATIO * fontSize);
 		}
+		let editorZoomLevelMultiplier = 1 + (EditorZoom.getZoomLevel() * 0.1);
+		fontSize *= editorZoomLevelMultiplier;
+		lineHeight *= editorZoomLevelMultiplier;
 
 		let disableTranslate3d = toBoolean(opts.disableTranslate3d);
 		let canUseTranslate3d = this._getCanUseTranslate3d();