Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-01 05:51:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

wip: splitview tweaking

Browse Source
This commit is contained in:
Joao Moreno
2017-09-18 22:20:53 +02:00
parent a260c08a9f
commit c236bf4984
4 changed files with 75 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vs/base/browser/ui/splitview/panelview.ts
View File

@@ -96,7 +96,7 @@ export abstract class Panel implements IView {
constructor(options: IPanelOptions = {}) {
this._expanded = typeof options.expanded === 'undefined' ? true : !!options.expanded;
this.ariaHeaderLabel = options.ariaHeaderLabel || '';
this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : 44;
this._minimumBodySize = typeof options.minimumBodySize === 'number' ? options.minimumBodySize : 120;
this._maximumBodySize = typeof options.maximumBodySize === 'number' ? options.maximumBodySize : Number.POSITIVE_INFINITY;
this.header = $('.panel-header');
}

46
src/vs/base/browser/ui/splitview/splitview2.ts
View File

@@ -39,6 +39,7 @@ interface IViewItem {
explicitSize: number;
container: HTMLElement;
disposable: IDisposable;
layout(): void;
}
interface ISashItem {
@@ -52,16 +53,6 @@ interface ISashDragState {
sizes: number[];
}
function layoutViewItem(item: IViewItem, orientation: Orientation): void {
if (orientation === Orientation.VERTICAL) {
item.container.style.height = `${item.size}px`;
} else {
item.container.style.width = `${item.size}px`;
}
item.view.layout(item.size, orientation);
}
export class SplitView implements IDisposable {
private orientation: Orientation;
@@ -98,8 +89,23 @@ export class SplitView implements IDisposable {
const containerDisposable = toDisposable(() => this.el.removeChild(container));
const disposable = combinedDisposable([onChangeDisposable, containerDisposable]);
const layoutContainer = this.orientation === Orientation.VERTICAL
? size => item.container.style.height = `${item.size}px`
: size => item.container.style.width = `${item.size}px`;
let previousSize: number | undefined = undefined;
const layout = () => {
if (item.size === previousSize) {
return;
}
layoutContainer(item.size);
item.view.layout(item.size, this.orientation);
previousSize = item.size;
};
const explicitSize = size;
const item: IViewItem = { view, container, explicitSize, size, disposable };
const item: IViewItem = { view, container, explicitSize, size, layout, disposable };
this.viewItems.splice(index, 0, item);
// Add sash
@@ -193,8 +199,14 @@ export class SplitView implements IDisposable {
}
private onViewChange(item: IViewItem): void {
item.size = clamp(item.size, item.view.minimumSize, item.view.maximumSize);
this.relayout();
const index = this.viewItems.indexOf(item);
if (index < 0 || index >= this.viewItems.length - 1) {
return;
}
const size = clamp(item.size, item.view.minimumSize, item.view.maximumSize);
this.resize(index, size - item.size);
}
resizeView(index: number, size: number): void {
@@ -219,6 +231,12 @@ export class SplitView implements IDisposable {
const down = downIndexes.map(i => this.viewItems[i]);
const downSizes = downIndexes.map(i => sizes[i]);
delta = clamp(
delta,
-upIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.minimumSize), 0),
downIndexes.reduce((r, i) => r + (sizes[i] - this.viewItems[i].view.minimumSize), 0)
);
for (let i = 0, deltaUp = delta; deltaUp !== 0 && i < up.length; i++) {
const item = up[i];
const size = clamp(upSizes[i] + deltaUp, item.view.minimumSize, item.view.maximumSize);
@@ -242,7 +260,7 @@ export class SplitView implements IDisposable {
}
private layoutViews(): void {
this.viewItems.forEach(item => layoutViewItem(item, this.orientation));
this.viewItems.forEach(item => item.layout());
this.sashItems.forEach(item => item.sash.layout());
// Update sashes enablement