microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-07-12 01:49:38 -05:00
Code Issues Packages Projects Releases 177 Wiki Activity

debt - rename titleControl to editorTabsControl

Browse Source
This commit is contained in:
Benjamin Pasero
2023-09-09 13:25:56 +02:00
parent 288532a45a
commit a54f99fec1
5 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vs/workbench/browser/parts/editor/editorGroupView.ts
View File

@@ -29,7 +29,7 @@ import { MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { DeferredPromise, Promises, RunOnceWorker } from 'vs/base/common/async';
import { EventType as TouchEventType, GestureEvent } from 'vs/base/browser/touch';
import { TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
import { EditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
import { IEditorGroupsAccessor, IEditorGroupView, fillActiveEditorViewState, EditorServiceImpl, IEditorGroupTitleHeight, IInternalEditorOpenOptions, IInternalMoveCopyOptions, IInternalEditorCloseOptions, IInternalEditorTitleControlOptions } from 'vs/workbench/browser/parts/editor/editor';
import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
@@ -118,7 +118,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
private readonly scopedInstantiationService: IInstantiationService;
private readonly titleContainer: HTMLElement;
private titleAreaControl: TitleControl;
private titleAreaControl: EditorTabsControl;
private readonly progressBar: ProgressBar;
@@ -458,7 +458,7 @@ export class EditorGroupView extends Themable implements IEditorGroupView {
this.titleContainer.classList.toggle('show-file-icons', this.accessor.partOptions.showIcons);
}
private createTitleAreaControl(): TitleControl {
private createTitleAreaControl(): EditorTabsControl {
// Clear old if existing
if (this.titleAreaControl) {

10
src/vs/workbench/browser/parts/editor/titleControl.ts → src/vs/workbench/browser/parts/editor/editorTabsControl.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import 'vs/css!./media/titlecontrol';
import 'vs/css!./media/editortabscontrol';
import { localize } from 'vs/nls';
import { applyDragImage, DataTransfers } from 'vs/base/browser/dnd';
import { addDisposableListener, Dimension, EventType } from 'vs/base/browser/dom';
@@ -47,7 +47,7 @@ export interface IToolbarActions {
secondary: IAction[];
}
export interface ITitleControlDimensions {
export interface IEditorTabsControlDimensions {
/**
* The size of the parent container the title control is layed out in.
@@ -87,7 +87,7 @@ export class EditorCommandsContextActionRunner extends ActionRunner {
}
}
export abstract class TitleControl extends Themable {
export abstract class EditorTabsControl extends Themable {
protected readonly editorTransfer = LocalSelectionTransfer.getInstance<DraggedEditorIdentifier>();
protected readonly groupTransfer = LocalSelectionTransfer.getInstance<DraggedEditorGroupIdentifier>();
@@ -430,7 +430,7 @@ export abstract class TitleControl extends Themable {
}
protected get titleHeight() {
return this.accessor.partOptions.tabHeight !== 'compact' ? TitleControl.EDITOR_TITLE_HEIGHT.normal : TitleControl.EDITOR_TITLE_HEIGHT.compact;
return this.accessor.partOptions.tabHeight !== 'compact' ? EditorTabsControl.EDITOR_TITLE_HEIGHT.normal : EditorTabsControl.EDITOR_TITLE_HEIGHT.compact;
}
protected updateTitleHeight(): void {
@@ -469,7 +469,7 @@ export abstract class TitleControl extends Themable {
abstract updateEditorDirty(editor: EditorInput): void;
abstract layout(dimensions: ITitleControlDimensions): Dimension;
abstract layout(dimensions: IEditorTabsControlDimensions): Dimension;
abstract getHeight(): IEditorGroupTitleHeight;

0
src/vs/workbench/browser/parts/editor/media/titlecontrol.css → src/vs/workbench/browser/parts/editor/media/editortabscontrol.css
View File

16
src/vs/workbench/browser/parts/editor/multiEditorTabsControl.ts
View File

@@ -19,7 +19,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { IMenuService, MenuId } from 'vs/platform/actions/common/actions';
import { EditorCommandsContextActionRunner, ITitleControlDimensions, IToolbarActions, TitleControl } from 'vs/workbench/browser/parts/editor/titleControl';
import { EditorCommandsContextActionRunner, IEditorTabsControlDimensions, IToolbarActions, EditorTabsControl } from 'vs/workbench/browser/parts/editor/editorTabsControl';
import { IQuickInputService } from 'vs/platform/quickinput/common/quickInput';
import { IDisposable, dispose, DisposableStore, combinedDisposable, MutableDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { ScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
@@ -84,7 +84,7 @@ interface IScheduledMultiEditorTabsControlLayout extends IDisposable {
options?: IMultiEditorTabsControlLayoutOptions;
}
export class MultiEditorTabsControl extends TitleControl {
export class MultiEditorTabsControl extends EditorTabsControl {
private static readonly SCROLLBAR_SIZES = {
default: 3,
@@ -119,7 +119,7 @@ export class MultiEditorTabsControl extends TitleControl {
private tabActionBars: ActionBar[] = [];
private tabDisposables: IDisposable[] = [];
private dimensions: ITitleControlDimensions & { used?: Dimension } = {
private dimensions: IEditorTabsControlDimensions & { used?: Dimension } = {
container: Dimension.None,
available: Dimension.None
};
@@ -1563,7 +1563,7 @@ export class MultiEditorTabsControl extends TitleControl {
return { total, offset };
}
layout(dimensions: ITitleControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): Dimension {
layout(dimensions: IEditorTabsControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): Dimension {
// Remember dimensions that we get
Object.assign(this.dimensions, dimensions);
@@ -1597,7 +1597,7 @@ export class MultiEditorTabsControl extends TitleControl {
return this.dimensions.used;
}
private doLayout(dimensions: ITitleControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): void {
private doLayout(dimensions: IEditorTabsControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): void {
// Only layout if we have valid tab index and dimensions
const activeTabAndIndex = this.group.activeEditor ? this.getTabAndIndex(this.group.activeEditor) : undefined;
@@ -1630,13 +1630,13 @@ export class MultiEditorTabsControl extends TitleControl {
this.group.relayout(); // relayout when breadcrumbs are enable/disabled
}
private doLayoutBreadcrumbs(dimensions: ITitleControlDimensions): void {
private doLayoutBreadcrumbs(dimensions: IEditorTabsControlDimensions): void {
if (this.breadcrumbsControl && !this.breadcrumbsControl.isHidden()) {
this.breadcrumbsControl.layout(new Dimension(dimensions.container.width, BreadcrumbsControl.HEIGHT));
}
}
private doLayoutTabs(activeTab: HTMLElement, activeIndex: number, dimensions: ITitleControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): void {
private doLayoutTabs(activeTab: HTMLElement, activeIndex: number, dimensions: IEditorTabsControlDimensions, options?: IMultiEditorTabsControlLayoutOptions): void {
// Always first layout tabs with wrapping support even if wrapping
// is disabled. The result indicates if tabs wrap and if not, we
@@ -1649,7 +1649,7 @@ export class MultiEditorTabsControl extends TitleControl {
}
}
private doLayoutTabsWrapping(dimensions: ITitleControlDimensions): boolean {
private doLayoutTabsWrapping(dimensions: IEditorTabsControlDimensions): boolean {
const [tabsAndActionsContainer, tabsContainer, editorToolbarContainer, tabsScrollbar] = assertAllDefined(this.tabsAndActionsContainer, this.tabsContainer, this.editorToolbarContainer, this.tabsScrollbar);
// Handle wrapping tabs according to setting:

6
src/vs/workbench/browser/parts/editor/singleEditorTabsControl.ts
View File

@@ -6,7 +6,7 @@
import 'vs/css!./media/singleeditortabscontrol';
import { EditorResourceAccessor, Verbosity, IEditorPartOptions, SideBySideEditor, preventEditorClose, EditorCloseMethod } from 'vs/workbench/common/editor';
import { EditorInput } from 'vs/workbench/common/editor/editorInput';
import { TitleControl, IToolbarActions, ITitleControlDimensions } from 'vs/workbench/browser/parts/editor/titleControl';
import { EditorTabsControl, IToolbarActions, IEditorTabsControlDimensions } from 'vs/workbench/browser/parts/editor/editorTabsControl';
import { ResourceLabel, IResourceLabel } from 'vs/workbench/browser/labels';
import { TAB_ACTIVE_FOREGROUND, TAB_UNFOCUSED_ACTIVE_FOREGROUND } from 'vs/workbench/common/theme';
import { EventType as TouchEventType, GestureEvent, Gesture } from 'vs/base/browser/touch';
@@ -24,7 +24,7 @@ interface IRenderedEditorLabel {
pinned: boolean;
}
export class SingleEditorTabsControl extends TitleControl {
export class SingleEditorTabsControl extends EditorTabsControl {
private titleContainer: HTMLElement | undefined;
private editorLabel: IResourceLabel | undefined;
@@ -355,7 +355,7 @@ export class SingleEditorTabsControl extends TitleControl {
};
}
layout(dimensions: ITitleControlDimensions): Dimension {
layout(dimensions: IEditorTabsControlDimensions): Dimension {
this.breadcrumbsControl?.layout(undefined);
return new Dimension(dimensions.container.width, this.getHeight().total);