Skip to content

Commit 614a35c

Browse files
author
Benjamin Pasero
committed
use IDimension from dom consistently
1 parent f67e7f4 commit 614a35c

6 files changed

Lines changed: 8 additions & 16 deletions

File tree

‎src/vs/editor/standalone/browser/simpleServices.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import { IProgressRunner, IEditorProgressService } from 'vs/platform/progress/co
4242
import { ITelemetryInfo, ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
4343
import { IWorkspace, IWorkspaceContextService, IWorkspaceFolder, IWorkspaceFoldersChangeEvent, WorkbenchState, WorkspaceFolder } from 'vs/platform/workspace/common/workspace';
4444
import { ISingleFolderWorkspaceIdentifier, IWorkspaceIdentifier } from 'vs/platform/workspaces/common/workspaces';
45-
import { ILayoutService, IDimension } from 'vs/platform/layout/browser/layoutService';
45+
import { ILayoutService } from 'vs/platform/layout/browser/layoutService';
4646
import { SimpleServicesNLS } from 'vs/editor/common/standaloneStrings';
4747
import { ClassifiedEvent, StrictPropertyCheck, GDPRClassification } from 'vs/platform/telemetry/common/gdprTypings';
4848
import { basename } from 'vs/base/common/resources';
@@ -732,8 +732,8 @@ export class SimpleLayoutService implements ILayoutService {
732732

733733
public onLayout = Event.None;
734734

735-
private _dimension?: IDimension;
736-
get dimension(): IDimension {
735+
private _dimension?: dom.IDimension;
736+
get dimension(): dom.IDimension {
737737
if (!this._dimension) {
738738
this._dimension = dom.getClientArea(window.document.body);
739739
}

‎src/vs/platform/layout/browser/layoutService.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@
55

66
import { Event } from 'vs/base/common/event';
77
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';
8+
import { IDimension } from 'vs/base/browser/dom';
89

910
export const ILayoutService = createDecorator<ILayoutService>('layoutService');
1011

11-
export interface IDimension {
12-
readonly width: number;
13-
readonly height: number;
14-
}
15-
1612
export interface ILayoutService {
1713

1814
_serviceBrand: undefined;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { Disposable, DisposableStore } from 'vs/base/common/lifecycle';
77
import { Emitter } from 'vs/base/common/event';
8-
import { EventType, addDisposableListener, addClass, removeClass, isAncestor, getClientArea, Dimension, toggleClass, position, size } from 'vs/base/browser/dom';
8+
import { EventType, addDisposableListener, addClass, removeClass, isAncestor, getClientArea, Dimension, toggleClass, position, size, IDimension } from 'vs/base/browser/dom';
99
import { onDidChangeFullscreen, isFullscreen } from 'vs/base/browser/browser';
1010
import { IBackupFileService } from 'vs/workbench/services/backup/common/backup';
1111
import { Registry } from 'vs/platform/registry/common/platform';
@@ -30,7 +30,6 @@ import { IWorkbenchEnvironmentService } from 'vs/workbench/services/environment/
3030
import { IEditorService, IResourceEditorInputType } from 'vs/workbench/services/editor/common/editorService';
3131
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
3232
import { SerializableGrid, ISerializableView, ISerializedGrid, Orientation, ISerializedNode, ISerializedLeafNode, Direction, IViewSize } from 'vs/base/browser/ui/grid/grid';
33-
import { IDimension } from 'vs/platform/layout/browser/layoutService';
3433
import { Part } from 'vs/workbench/browser/part';
3534
import { IStatusbarService } from 'vs/workbench/services/statusbar/common/statusbar';
3635
import { IActivityBarService } from 'vs/workbench/services/activityBar/browser/activityBarService';

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
import 'vs/css!./media/part';
77
import { Component } from 'vs/workbench/common/component';
88
import { IThemeService, IColorTheme } from 'vs/platform/theme/common/themeService';
9-
import { Dimension, size } from 'vs/base/browser/dom';
9+
import { Dimension, size, IDimension } from 'vs/base/browser/dom';
1010
import { IStorageService } from 'vs/platform/storage/common/storage';
11-
import { IDimension } from 'vs/platform/layout/browser/layoutService';
1211
import { ISerializableView, IViewSize } from 'vs/base/browser/ui/grid/grid';
1312
import { Event, Emitter } from 'vs/base/common/event';
1413
import { IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';

‎src/vs/workbench/contrib/watermark/browser/watermark.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import * as dom from 'vs/base/browser/dom';
2626
import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLabel';
2727
import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editorGroupsService';
2828
import { CommandsRegistry } from 'vs/platform/commands/common/commands';
29-
import { IDimension } from 'vs/platform/layout/browser/layoutService';
3029
import { TERMINAL_COMMAND_ID } from 'vs/workbench/contrib/terminal/common/terminal';
3130
import { assertIsDefined } from 'vs/base/common/types';
3231
import { workbenchConfigurationNodeBase } from 'vs/workbench/common/configuration';
@@ -157,7 +156,7 @@ export class WatermarkContribution extends Disposable implements IWorkbenchContr
157156
this.handleEditorPartSize(container, this.editorGroupsService.contentDimension);
158157
}
159158

160-
private handleEditorPartSize(container: HTMLElement, dimension: IDimension): void {
159+
private handleEditorPartSize(container: HTMLElement, dimension: dom.IDimension): void {
161160
if (dimension.height <= 478) {
162161
dom.addClass(container, 'max-height-478px');
163162
} else {

‎src/vs/workbench/test/browser/workbenchTestServices.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { IEditorService, IOpenEditorOverrideHandler, ISaveEditorsOptions, IRever
5656
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
5757
import { IEditorRegistry, EditorDescriptor, Extensions } from 'vs/workbench/browser/editor';
5858
import { EditorGroup } from 'vs/workbench/common/editor/editorGroup';
59-
import { Dimension } from 'vs/base/browser/dom';
59+
import { Dimension, IDimension } from 'vs/base/browser/dom';
6060
import { ILogService, NullLogService } from 'vs/platform/log/common/log';
6161
import { ILabelService } from 'vs/platform/label/common/label';
6262
import { timeout } from 'vs/base/common/async';
@@ -66,7 +66,6 @@ import { IViewlet } from 'vs/workbench/common/viewlet';
6666
import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage';
6767
import { isLinux } from 'vs/base/common/platform';
6868
import { LabelService } from 'vs/workbench/services/label/common/labelService';
69-
import { IDimension } from 'vs/platform/layout/browser/layoutService';
7069
import { Part } from 'vs/workbench/browser/part';
7170
import { IPanelService } from 'vs/workbench/services/panel/common/panelService';
7271
import { IPanel } from 'vs/workbench/common/panel';

0 commit comments

Comments
 (0)