Skip to content

Commit dcdab41

Browse files
joaomorenojoaomoreno
committed
hide away gridview types
1 parent 916287f commit dcdab41

5 files changed

Lines changed: 16 additions & 13 deletions

File tree

‎src/vs/base/browser/ui/centered/centeredViewLayout.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { SplitView, Orientation, ISplitViewStyles, IView as ISplitViewView } from 'vs/base/browser/ui/splitview/splitview';
77
import { $ } from 'vs/base/browser/dom';
88
import { Event } from 'vs/base/common/event';
9-
import { IView, IViewSize } from 'vs/base/browser/ui/grid/gridview';
9+
import { IView, IViewSize } from 'vs/base/browser/ui/grid/grid';
1010
import { IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
1111
import { Color } from 'vs/base/common/color';
1212

‎src/vs/base/browser/ui/grid/grid.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ import 'vs/css!./gridview';
77
import { Orientation } from 'vs/base/browser/ui/sash/sash';
88
import { Disposable } from 'vs/base/common/lifecycle';
99
import { tail2 as tail, equals } from 'vs/base/common/arrays';
10-
import { orthogonal, IView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize } from './gridview';
10+
import { orthogonal, IView as IGridViewView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize } from './gridview';
1111
import { Event } from 'vs/base/common/event';
1212
import { InvisibleSizing } from 'vs/base/browser/ui/splitview/splitview';
1313

14-
export { Orientation, Sizing as GridViewSizing } from './gridview';
14+
export { Orientation, Sizing as GridViewSizing, IViewSize, orthogonal, LayoutPriority } from './gridview';
1515

1616
export const enum Direction {
1717
Up,
@@ -29,6 +29,10 @@ function oppositeDirection(direction: Direction): Direction {
2929
}
3030
}
3131

32+
export interface IView extends IGridViewView {
33+
readonly preferredSize?: number;
34+
}
35+
3236
export interface GridLeafNode<T extends IView> {
3337
readonly view: T;
3438
readonly box: Box;
@@ -217,7 +221,7 @@ export class Grid<T extends IView = IView> extends Disposable {
217221
this.gridview = new GridView(options);
218222
this._register(this.gridview);
219223

220-
this._register(this.gridview.onDidSashReset(this.doResetViewSize, this));
224+
this._register(this.gridview.onDidSashReset(this.onDidSashReset, this));
221225

222226
const size: number | GridViewSizing = typeof options.firstViewVisibleCachedSize === 'number'
223227
? GridViewSizing.Invisible(options.firstViewVisibleCachedSize)
@@ -370,7 +374,7 @@ export class Grid<T extends IView = IView> extends Disposable {
370374
return getGridLocation(element);
371375
}
372376

373-
private doResetViewSize(location: number[]): void {
377+
private onDidSashReset(location: number[]): void {
374378
const [parentLocation,] = tail(location);
375379
this.gridview.distributeViewSizes(parentLocation);
376380
}

‎src/vs/base/test/browser/ui/grid/util.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55

66
import * as assert from 'assert';
77
import { Emitter, Event } from 'vs/base/common/event';
8-
import { IView, GridNode, isGridBranchNode, } from 'vs/base/browser/ui/grid/gridview';
8+
import { GridNode, isGridBranchNode } from 'vs/base/browser/ui/grid/gridview';
9+
import { IView } from 'vs/base/browser/ui/grid/grid';
910

1011
export class TestView implements IView {
1112

@@ -78,4 +79,4 @@ export function nodesToArrays(node: GridNode): any {
7879
} else {
7980
return node.view;
8081
}
81-
}
82+
}

‎src/vs/workbench/browser/part.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,9 @@ import { IThemeService, ITheme } from 'vs/platform/theme/common/themeService';
99
import { Dimension, size } from 'vs/base/browser/dom';
1010
import { IStorageService } from 'vs/platform/storage/common/storage';
1111
import { IDimension } from 'vs/platform/layout/browser/layoutService';
12-
import { ISerializableView, Orientation } from 'vs/base/browser/ui/grid/grid';
12+
import { ISerializableView, Orientation, IViewSize } from 'vs/base/browser/ui/grid/grid';
1313
import { Event, Emitter } from 'vs/base/common/event';
1414
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
15-
import { IViewSize } from 'vs/base/browser/ui/grid/gridview';
1615

1716
export interface IPartOptions {
1817
hasTitle?: boolean;
@@ -164,4 +163,4 @@ class PartLayout {
164163

165164
return { titleSize, contentSize };
166165
}
167-
}
166+
}

‎src/vs/workbench/browser/parts/editor/editorPart.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import { Event, Emitter, Relay } from 'vs/base/common/event';
1111
import { contrastBorder, editorBackground } from 'vs/platform/theme/common/colorRegistry';
1212
import { GroupDirection, IAddGroupOptions, GroupsArrangement, GroupOrientation, IMergeGroupOptions, MergeGroupMode, ICopyEditorOptions, GroupsOrder, GroupChangeKind, GroupLocation, IFindGroupScope, EditorGroupLayout, GroupLayoutArgument, IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
1313
import { IInstantiationService, ServiceIdentifier } from 'vs/platform/instantiation/common/instantiation';
14-
import { Direction, SerializableGrid, Sizing, ISerializedGrid, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
14+
import { IView, orthogonal, LayoutPriority, IViewSize, Direction, SerializableGrid, Sizing, ISerializedGrid, Orientation, GridBranchNode, isGridBranchNode, GridNode, createSerializedGrid, Grid } from 'vs/base/browser/ui/grid/grid';
1515
import { GroupIdentifier, IWorkbenchEditorConfiguration, IEditorPartOptions } from 'vs/workbench/common/editor';
1616
import { values } from 'vs/base/common/map';
1717
import { EDITOR_GROUP_BORDER, EDITOR_PANE_BACKGROUND } from 'vs/workbench/common/theme';
@@ -27,7 +27,6 @@ import { EditorDropTarget } from 'vs/workbench/browser/parts/editor/editorDropTa
2727
import { localize } from 'vs/nls';
2828
import { Color } from 'vs/base/common/color';
2929
import { CenteredViewLayout } from 'vs/base/browser/ui/centered/centeredViewLayout';
30-
import { IView, orthogonal, LayoutPriority, IViewSize } from 'vs/base/browser/ui/grid/gridview';
3130
import { onUnexpectedError } from 'vs/base/common/errors';
3231
import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
3332
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
@@ -994,4 +993,4 @@ export class EditorPart extends Part implements IEditorGroupsService, IEditorGro
994993
}
995994
}
996995

997-
registerSingleton(IEditorGroupsService, EditorPart);
996+
registerSingleton(IEditorGroupsService, EditorPart);

0 commit comments

Comments
 (0)