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

code 💄 (#204967)

Browse Source
This commit is contained in:
Benjamin Pasero
2024-02-12 10:55:48 +01:00
committed by GitHub
parent 983a3bc0ae
commit 420099cb09
8 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/compositeBarActions.ts
+5 -5
View File
@@ -144,7 +144,7 @@ export interface ICompositeBarActionViewItemOptions extends IActionViewItemOptio
readonly compact?: boolean;
}
export class CompoisteBarActionViewItem extends BaseActionViewItem {
export class CompositeBarActionViewItem extends BaseActionViewItem {
private static hoverLeaveTime = 0;
@@ -394,7 +394,7 @@ export class CompoisteBarActionViewItem extends BaseActionViewItem {
this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_OVER, () => {
if (!this.showHoverScheduler.isScheduled()) {
if (Date.now() - CompoisteBarActionViewItem.hoverLeaveTime < 200) {
if (Date.now() - CompositeBarActionViewItem.hoverLeaveTime < 200) {
this.showHover(true);
} else {
this.showHoverScheduler.schedule(this.configurationService.getValue<number>('workbench.hover.delay'));
@@ -404,7 +404,7 @@ export class CompoisteBarActionViewItem extends BaseActionViewItem {
this.hoverDisposables.add(addDisposableListener(this.container, EventType.MOUSE_LEAVE, e => {
if (e.target === this.container) {
CompoisteBarActionViewItem.hoverLeaveTime = Date.now();
CompositeBarActionViewItem.hoverLeaveTime = Date.now();
this.hoverService.hideHover();
this.showHoverScheduler.cancel();
}
@@ -467,7 +467,7 @@ export class CompositeOverflowActivityAction extends CompositeBarAction {
}
}
export class CompositeOverflowActivityActionViewItem extends CompoisteBarActionViewItem {
export class CompositeOverflowActivityActionViewItem extends CompositeBarActionViewItem {
constructor(
action: CompositeBarAction,
@@ -529,7 +529,7 @@ class ManageExtensionAction extends Action {
}
}
export class CompositeActionViewItem extends CompoisteBarActionViewItem {
export class CompositeActionViewItem extends CompositeBarActionViewItem {
private static manageExtensionAction: ManageExtensionAction;
src/vs/workbench/browser/parts/globalCompositeBar.ts
+2 -2
View File
@@ -12,7 +12,7 @@ import { DisposableStore, Disposable } from 'vs/base/common/lifecycle';
import { IColorTheme, IThemeService } from 'vs/platform/theme/common/themeService';
import { IStorageService, StorageScope, StorageTarget } from 'vs/platform/storage/common/storage';
import { IExtensionService } from 'vs/workbench/services/extensions/common/extensions';
import { CompoisteBarActionViewItem, CompositeBarAction, IActivityHoverOptions, ICompositeBarActionViewItemOptions, ICompositeBarColors } from 'vs/workbench/browser/parts/compositeBarActions';
import { CompositeBarActionViewItem, CompositeBarAction, IActivityHoverOptions, ICompositeBarActionViewItemOptions, ICompositeBarColors } from 'vs/workbench/browser/parts/compositeBarActions';
import { Codicon } from 'vs/base/common/codicons';
import { ThemeIcon } from 'vs/base/common/themables';
import { registerIcon } from 'vs/platform/theme/common/iconRegistry';
@@ -153,7 +153,7 @@ export class GlobalCompositeBar extends Disposable {
}
}
abstract class AbstractGlobalActivityActionViewItem extends CompoisteBarActionViewItem {
abstract class AbstractGlobalActivityActionViewItem extends CompositeBarActionViewItem {
constructor(
private readonly menuId: MenuId,
src/vs/workbench/browser/parts/panel/panelActions.ts
+1 -1
View File
@@ -199,7 +199,7 @@ AlignPanelActionConfigs.forEach(alignPanelAction => {
constructor() {
super({
id,
title: title,
title,
category: Categories.View,
toggled: when.negate(),
f1: true
src/vs/workbench/browser/parts/titlebar/menubarControl.ts
+4 -4
View File
@@ -665,7 +665,7 @@ export class CustomMenubarControl extends MenubarControl {
if (!this.focusInsideMenubar) {
const actions: IAction[] = [];
updateActions(this.toActionsArray(menu), actions, title);
this.menubar?.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
this.menubar?.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
}
}));
@@ -675,7 +675,7 @@ export class CustomMenubarControl extends MenubarControl {
if (!this.focusInsideMenubar) {
const actions: IAction[] = [];
updateActions(this.toActionsArray(menu), actions, title);
this.menubar?.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
this.menubar?.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
}
}));
}
@@ -688,9 +688,9 @@ export class CustomMenubarControl extends MenubarControl {
if (this.menubar) {
if (!firstTime) {
this.menubar.updateMenu({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
this.menubar.updateMenu({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
} else {
this.menubar.push({ actions: actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
this.menubar.push({ actions, label: mnemonicMenuLabel(this.topLevelTitles[title]) });
}
}
}
src/vs/workbench/browser/parts/views/viewPaneContainer.ts
+1 -1
View File
@@ -658,7 +658,7 @@ export class ViewPaneContainer extends Component implements IViewPaneContainer {
addPanes(panes: { pane: ViewPane; size: number; index?: number; disposable: IDisposable }[]): void {
const wasMerged = this.isViewMergedWithContainer();
for (const { pane: pane, size, index, disposable } of panes) {
for (const { pane, size, index, disposable } of panes) {
this.addPane(pane, size, disposable, index);
}
src/vs/workbench/common/editor/sideBySideEditorInput.ts
+2 -2
View File
@@ -362,8 +362,8 @@ export abstract class AbstractSideBySideEditorInputSerializer implements IEditor
const serializedEditorInput: ISerializedSideBySideEditorInput = {
name: input.getPreferredName(),
description: input.getPreferredDescription(),
primarySerialized: primarySerialized,
secondarySerialized: secondarySerialized,
primarySerialized,
secondarySerialized,
primaryTypeId: input.primary.typeId,
secondaryTypeId: input.secondary.typeId
};
src/vs/workbench/contrib/timeline/browser/timelinePane.ts
+6 -6
View File
@@ -747,7 +747,7 @@ export class TimelinePane extends ViewPane {
}
const iterator = timeline.items[Symbol.iterator]();
sources.push({ timeline: timeline, iterator: iterator, nextItem: iterator.next() });
sources.push({ timeline, iterator, nextItem: iterator.next() });
}
this._visibleItemCount = hasAnyItems ? 1 : 0;
@@ -1046,7 +1046,7 @@ export class TimelinePane extends ViewPane {
this.tree.domFocus();
}
},
getActionsContext: (): TimelineActionContext => ({ uri: this.uri, item: item }),
getActionsContext: (): TimelineActionContext => ({ uri: this.uri, item }),
actionRunner: new TimelineActionRunner()
});
}
@@ -1068,13 +1068,13 @@ class TimelineElementTemplate implements IDisposable {
container.classList.add('custom-view-tree-node-item');
this.icon = DOM.append(container, DOM.$('.custom-view-tree-node-item-icon'));
this.iconLabel = new IconLabel(container, { supportHighlights: true, supportIcons: true, hoverDelegate: hoverDelegate });
this.iconLabel = new IconLabel(container, { supportHighlights: true, supportIcons: true, hoverDelegate });
const timestampContainer = DOM.append(this.iconLabel.element, DOM.$('.timeline-timestamp-container'));
this.timestamp = DOM.append(timestampContainer, DOM.$('span.timeline-timestamp'));
const actionsContainer = DOM.append(this.iconLabel.element, DOM.$('.actions'));
this.actionBar = new ActionBar(actionsContainer, { actionViewItemProvider: actionViewItemProvider });
this.actionBar = new ActionBar(actionsContainer, { actionViewItemProvider });
}
dispose() {
@@ -1109,7 +1109,7 @@ class TimelineActionRunner extends ActionRunner {
$mid: MarshalledId.TimelineActionContext,
handle: item.handle,
source: item.source,
uri: uri
uri
},
uri,
item.source,
@@ -1212,7 +1212,7 @@ class TimelineTreeRenderer implements ITreeRenderer<TreeElement, FuzzyScore, Tim
template.timestamp.ariaLabel = item.relativeTimeFullWord ?? '';
template.timestamp.parentElement!.classList.toggle('timeline-timestamp--duplicate', isTimelineItem(item) && item.hideRelativeTime);
template.actionBar.context = { uri: this.uri, item: item } as TimelineActionContext;
template.actionBar.context = { uri: this.uri, item } as TimelineActionContext;
template.actionBar.actionRunner = new TimelineActionRunner();
template.actionBar.push(this.commands.getItemActions(item), { icon: true, label: false });
src/vs/workbench/electron-sandbox/parts/titlebar/menubarControl.ts
+1 -1
View File
@@ -126,7 +126,7 @@ export class NativeMenubarControl extends MenubarControl {
const menubarSubmenuItem: IMenubarMenuItemSubmenu = {
id: menuItem.id,
label: title,
submenu: submenu
submenu
};
menuToPopulate.items.push(menubarSubmenuItem);