#16394 Move VSash to sash.ts

src/vs/base/browser/ui/sash/sash.ts

@@ -6,8 +6,8 @@
 'use strict';
 
 import 'vs/css!./sash';
-import { IDisposable, dispose } from 'vs/base/common/lifecycle';
-import { Builder, $ } from 'vs/base/browser/builder';
+import { IDisposable, Disposable, dispose } from 'vs/base/common/lifecycle';
+import { Builder, $, Dimension } from 'vs/base/browser/builder';
 import { isIPad } from 'vs/base/browser/browser';
 import { isMacintosh } from 'vs/base/common/platform';
 import types = require('vs/base/common/types');
@@ -15,6 +15,7 @@ import DOM = require('vs/base/browser/dom');
 import { Gesture, EventType, GestureEvent } from 'vs/base/browser/touch';
 import { EventEmitter } from 'vs/base/common/eventEmitter';
 import { StandardMouseEvent } from 'vs/base/browser/mouseEvent';
+import Event, { Emitter } from 'vs/base/common/event';
 
 export interface ISashLayoutProvider { }
 
@@ -276,3 +277,92 @@ export class Sash extends EventEmitter {
 		super.dispose();
 	}
 }
+
+/**
+ * A simple Vertical Sash that computes the position of the sash when it is moved between the given dimension.
+ * Triggers onPositionChange event when the position is changed
+ */
+export class VSash extends Disposable implements IVerticalSashLayoutProvider {
+
+	private sash: Sash;
+	private ratio: number;
+	private startPosition: number;
+	private position: number;
+	private dimension: Dimension;
+
+	private _onPositionChange: Emitter<number> = new Emitter<number>();
+	public get onPositionChange(): Event<number> { return this._onPositionChange.event; }
+
+	constructor(container: HTMLElement, private minWidth) {
+		super();
+		this.ratio = 0.5;
+		this.sash = new Sash(container, this);
+
+		this._register(this.sash.addListener2('start', () => this.onSashDragStart()));
+		this._register(this.sash.addListener2('change', (e: ISashEvent) => this.onSashDrag(e)));
+		this._register(this.sash.addListener2('end', () => this.onSashDragEnd()));
+		this._register(this.sash.addListener2('reset', () => this.onSashReset()));
+	}
+
+	public getVerticalSashTop(): number {
+		return 0;
+	}
+
+	public getVerticalSashLeft(): number {
+		return this.position;
+	}
+
+	public getVerticalSashHeight(): number {
+		return this.dimension.height;
+	}
+
+	public setDimenesion(dimension: Dimension) {
+		this.dimension = dimension;
+		this.compute(this.ratio);
+	}
+
+	private onSashDragStart(): void {
+		this.startPosition = this.position;
+	}
+
+	private onSashDrag(e: ISashEvent): void {
+		this.compute((this.startPosition + (e.currentX - e.startX)) / this.dimension.width);
+	}
+
+	private compute(ratio: number) {
+		this.computeSashPosition(ratio);
+		this.ratio = this.position / this.dimension.width;
+		this._onPositionChange.fire(this.position);
+	}
+
+	private onSashDragEnd(): void {
+		this.sash.layout();
+	}
+
+	private onSashReset(): void {
+		this.ratio = 0.5;
+		this._onPositionChange.fire(this.position);
+		this.sash.layout();
+	}
+
+	private computeSashPosition(sashRatio: number = this.ratio) {
+		let contentWidth = this.dimension.width;
+		let sashPosition = Math.floor((sashRatio || 0.5) * contentWidth);
+		let midPoint = Math.floor(0.5 * contentWidth);
+
+		if (contentWidth > this.minWidth * 2) {
+			if (sashPosition < this.minWidth) {
+				sashPosition = this.minWidth;
+			}
+			if (sashPosition > contentWidth - this.minWidth) {
+				sashPosition = contentWidth - this.minWidth;
+			}
+		} else {
+			sashPosition = midPoint;
+		}
+		if (this.position !== sashPosition) {
+			this.position = sashPosition;
+			this.sash.layout();
+		}
+	}
+}
\ No newline at end of file

src/vs/workbench/browser/parts/editor/sideBySideEditor.ts

@@ -6,16 +6,14 @@
 import 'vs/css!./media/sidebysideEditor';
 import { TPromise } from 'vs/base/common/winjs.base';
 import * as strings from 'vs/base/common/strings';
-import { Disposable } from 'vs/base/common/lifecycle';
 import * as DOM from 'vs/base/browser/dom';
 import { Dimension, Builder } from 'vs/base/browser/builder';
-import Event, { Emitter } from 'vs/base/common/event';
 
 import { Registry } from 'vs/platform/platform';
 import { IEditorRegistry, Extensions as EditorExtensions, EditorInput, EditorOptions, SideBySideEditorInput } from 'vs/workbench/common/editor';
 import { BaseEditor, EditorDescriptor } from 'vs/workbench/browser/parts/editor/baseEditor';
 import { IEditorControl, Position } from 'vs/platform/editor/common/editor';
-import { Sash, ISashEvent, IVerticalSashLayoutProvider } from 'vs/base/browser/ui/sash/sash';
+import { VSash } from 'vs/base/browser/ui/sash/sash';
 
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
@@ -134,7 +132,7 @@ export class SideBySideEditor extends BaseEditor {
 	}
 
 	private createSash(parentElement: HTMLElement): void {
-		this.sash = this._register(new VSash(parentElement));
+		this.sash = this._register(new VSash(parentElement, 220));
 		this._register(this.sash.onPositionChange(position => this.dolayout(position)));
 	}
 
@@ -176,91 +174,4 @@ export class SideBySideEditor extends BaseEditor {
 			this.masterEditorContainer = null;
 		}
 	}
-}
-
-class VSash extends Disposable implements IVerticalSashLayoutProvider {
-
-	private static MINIMUM_EDITOR_WIDTH = 220;
-
-	private sash: Sash;
-	private ratio: number;
-	private startPosition: number;
-	private position: number;
-	private dimension: Dimension;
-
-	private _onPositionChange: Emitter<number> = new Emitter<number>();
-	public get onPositionChange(): Event<number> { return this._onPositionChange.event; }
-
-	constructor(container: HTMLElement) {
-		super();
-		this.ratio = 0.5;
-		this.sash = new Sash(container, this);
-
-		this._register(this.sash.addListener2('start', () => this.onSashDragStart()));
-		this._register(this.sash.addListener2('change', (e: ISashEvent) => this.onSashDrag(e)));
-		this._register(this.sash.addListener2('end', () => this.onSashDragEnd()));
-		this._register(this.sash.addListener2('reset', () => this.onSashReset()));
-	}
-
-	public getVerticalSashTop(): number {
-		return 0;
-	}
-
-	public getVerticalSashLeft(): number {
-		return this.position;
-	}
-
-	public getVerticalSashHeight(): number {
-		return this.dimension.height;
-	}
-
-	public setDimenesion(dimension: Dimension) {
-		this.dimension = dimension;
-		this.compute(this.ratio);
-	}
-
-	private onSashDragStart(): void {
-		this.startPosition = this.position;
-	}
-
-	private onSashDrag(e: ISashEvent): void {
-		this.compute((this.startPosition + (e.currentX - e.startX)) / this.dimension.width);
-	}
-
-	private compute(ratio: number) {
-		this.computeSashPosition(ratio);
-		this.ratio = this.position / this.dimension.width;
-		this._onPositionChange.fire(this.position);
-	}
-
-	private onSashDragEnd(): void {
-		this.sash.layout();
-	}
-
-	private onSashReset(): void {
-		this.ratio = 0.5;
-		this._onPositionChange.fire(this.position);
-		this.sash.layout();
-	}
-
-	private computeSashPosition(sashRatio: number = this.ratio) {
-		let contentWidth = this.dimension.width;
-		let sashPosition = Math.floor((sashRatio || 0.5) * contentWidth);
-		let midPoint = Math.floor(0.5 * contentWidth);
-
-		if (contentWidth > VSash.MINIMUM_EDITOR_WIDTH * 2) {
-			if (sashPosition < VSash.MINIMUM_EDITOR_WIDTH) {
-				sashPosition = VSash.MINIMUM_EDITOR_WIDTH;
-			}
-			if (sashPosition > contentWidth - VSash.MINIMUM_EDITOR_WIDTH) {
-				sashPosition = contentWidth - VSash.MINIMUM_EDITOR_WIDTH;
-			}
-		} else {
-			sashPosition = midPoint;
-		}
-		if (this.position !== sashPosition) {
-			this.position = sashPosition;
-			this.sash.layout();
-		}
-	}
 }
\ No newline at end of file