ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 08:40:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 817eb6b0c720a4ecbc13c020afbbebfed667aa09 (#7356)

Browse Source
This commit is contained in:
Anthony Dresser
2019-09-24 21:36:17 -07:00
committed by GitHub
parent a29ae4d3b9
commit 6a6048d40f
541 changed files with 7045 additions and 7287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/vs/workbench/browser/parts/compositeBarActions.ts
View File

@@ -51,10 +51,10 @@ export interface ICompositeBar {
export class ActivityAction extends Action {
private _onDidChangeActivity = new Emitter<this>();
private readonly _onDidChangeActivity = new Emitter<this>();
readonly onDidChangeActivity: Event<this> = this._onDidChangeActivity.event;
private _onDidChangeBadge = new Emitter<this>();
private readonly _onDidChangeBadge = new Emitter<this>();
readonly onDidChangeBadge: Event<this> = this._onDidChangeBadge.event;
private badge?: IBadge;

4
src/vs/workbench/browser/parts/editor/breadcrumbsControl.ts
View File

@@ -45,7 +45,7 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService';
import { IEditorGroupView } from 'vs/workbench/browser/parts/editor/editor';
import { onDidChangeZoomLevel } from 'vs/base/browser/browser';
import { withNullAsUndefined, withUndefinedAsNull } from 'vs/base/common/types';
import { withNullAsUndefined } from 'vs/base/common/types';
import { ILabelService } from 'vs/platform/label/common/label';
class Item extends BreadcrumbsItem {
@@ -485,7 +485,7 @@ export class BreadcrumbsControl {
selection: Range.collapseToStart(element.symbol.selectionRange),
revealInCenterIfOutsideViewport: true
}
}, withUndefinedAsNull(this._getActiveCodeEditor()), group === SIDE_GROUP);
}, this._getActiveCodeEditor(), group === SIDE_GROUP);
}
}
}

2
src/vs/workbench/browser/parts/editor/breadcrumbsModel.ts
View File

@@ -45,7 +45,7 @@ export class EditorBreadcrumbsModel {
private _outlineElements: Array<OutlineModel | OutlineGroup | OutlineElement> = [];
private _outlineDisposables = new DisposableStore();
private _onDidUpdate = new Emitter<this>();
private readonly _onDidUpdate = new Emitter<this>();
readonly onDidUpdate: Event<this> = this._onDidUpdate.event;
constructor(

4
src/vs/workbench/browser/parts/editor/editor.contribution.ts
View File

@@ -418,12 +418,12 @@ editorCommands.setup();
// Touch Bar
if (isMacintosh) {
MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, iconLocation: { dark: URI.parse(registerAndGetAmdImageURL('vs/workbench/browser/parts/editor/media/back-tb.png')) } },
command: { id: NavigateBackwardsAction.ID, title: NavigateBackwardsAction.LABEL, iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/back-tb.png')) } },
group: 'navigation'
});
MenuRegistry.appendMenuItem(MenuId.TouchBarContext, {
command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, iconLocation: { dark: URI.parse(registerAndGetAmdImageURL('vs/workbench/browser/parts/editor/media/forward-tb.png')) } },
command: { id: NavigateForwardAction.ID, title: NavigateForwardAction.LABEL, iconLocation: { dark: URI.parse(require.toUrl('vs/workbench/browser/parts/editor/media/forward-tb.png')) } },
group: 'navigation'
});
}

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

@@ -467,7 +467,7 @@ export class CloseEditorAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'close-editor-action');
super(id, label, 'codicon-close');
}
run(context?: IEditorCommandsContext): Promise<any> {
@@ -485,7 +485,7 @@ export class CloseOneEditorAction extends Action {
label: string,
@IEditorGroupsService private readonly editorGroupService: IEditorGroupsService
) {
super(id, label, 'close-editor-action');
super(id, label, 'codicon-close');
}
run(context?: IEditorCommandsContext): Promise<any> {
@@ -669,7 +669,7 @@ export class CloseAllEditorsAction extends BaseCloseAllAction {
@ITextFileService textFileService: ITextFileService,
@IEditorGroupsService editorGroupService: IEditorGroupsService
) {
super(id, label, 'action-close-all-files', textFileService, editorGroupService);
super(id, label, 'codicon-close-all', textFileService, editorGroupService);
}
protected doCloseAll(): Promise<any> {

2
src/vs/workbench/browser/parts/editor/editorStatus.ts
View File

@@ -206,8 +206,6 @@ class State {
private _metadata: string | undefined;
get metadata(): string | undefined { return this._metadata; }
constructor() { }
update(update: StateDelta): StateChange {
const change = new StateChange();

3
src/vs/workbench/browser/parts/editor/media/close-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 8.70711L11.6465 12.3536L12.3536 11.6464L8.70711 8L12.3536 4.35355L11.6465 3.64645L8.00001 7.29289L4.35356 3.64645L3.64645 4.35355L7.2929 8L3.64645 11.6464L4.35356 12.3536L8.00001 8.70711Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 367 B

1
src/vs/workbench/browser/parts/editor/media/close-dirty-alt.svg
View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle fill="#424242" cx="8" cy="8" r="4"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 167 B

3
src/vs/workbench/browser/parts/editor/media/close-dirty-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 4C8.36719 4 8.72135 4.04818 9.0625 4.14453C9.40365 4.23828 9.72135 4.3724 10.0156 4.54688C10.3125 4.72135 10.582 4.93099 10.8242 5.17578C11.069 5.41797 11.2786 5.6875 11.4531 5.98438C11.6276 6.27865 11.7617 6.59635 11.8555 6.9375C11.9518 7.27865 12 7.63281 12 8C12 8.36719 11.9518 8.72135 11.8555 9.0625C11.7617 9.40365 11.6276 9.72266 11.4531 10.0195C11.2786 10.3138 11.069 10.5833 10.8242 10.8281C10.582 11.0703 10.3125 11.2786 10.0156 11.4531C9.72135 11.6276 9.40365 11.763 9.0625 11.8594C8.72135 11.9531 8.36719 12 8 12C7.63281 12 7.27865 11.9531 6.9375 11.8594C6.59635 11.763 6.27734 11.6276 5.98047 11.4531C5.6862 11.2786 5.41667 11.0703 5.17188 10.8281C4.92969 10.5833 4.72135 10.3138 4.54688 10.0195C4.3724 9.72266 4.23698 9.40365 4.14063 9.0625C4.04688 8.72135 4 8.36719 4 8C4 7.63281 4.04688 7.27865 4.14063 6.9375C4.23698 6.59635 4.3724 6.27865 4.54688 5.98438C4.72135 5.6875 4.92969 5.41797 5.17188 5.17578C5.41667 4.93099 5.6862 4.72135 5.98047 4.54688C6.27734 4.3724 6.59635 4.23828 6.9375 4.14453C7.27865 4.04818 7.63281 4 8 4Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

3
src/vs/workbench/browser/parts/editor/media/close-dirty-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M8 4C8.36719 4 8.72135 4.04818 9.0625 4.14453C9.40365 4.23828 9.72135 4.3724 10.0156 4.54688C10.3125 4.72135 10.582 4.93099 10.8242 5.17578C11.069 5.41797 11.2786 5.6875 11.4531 5.98438C11.6276 6.27865 11.7617 6.59635 11.8555 6.9375C11.9518 7.27865 12 7.63281 12 8C12 8.36719 11.9518 8.72135 11.8555 9.0625C11.7617 9.40365 11.6276 9.72266 11.4531 10.0195C11.2786 10.3138 11.069 10.5833 10.8242 10.8281C10.582 11.0703 10.3125 11.2786 10.0156 11.4531C9.72135 11.6276 9.40365 11.763 9.0625 11.8594C8.72135 11.9531 8.36719 12 8 12C7.63281 12 7.27865 11.9531 6.9375 11.8594C6.59635 11.763 6.27734 11.6276 5.98047 11.4531C5.6862 11.2786 5.41667 11.0703 5.17188 10.8281C4.92969 10.5833 4.72135 10.3138 4.54688 10.0195C4.3724 9.72266 4.23698 9.40365 4.14063 9.0625C4.04688 8.72135 4 8.36719 4 8C4 7.63281 4.04688 7.27865 4.14063 6.9375C4.23698 6.59635 4.3724 6.27865 4.54688 5.98438C4.72135 5.6875 4.92969 5.41797 5.17188 5.17578C5.41667 4.93099 5.6862 4.72135 5.98047 4.54688C6.27734 4.3724 6.59635 4.23828 6.9375 4.14453C7.27865 4.04818 7.63281 4 8 4Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

1
src/vs/workbench/browser/parts/editor/media/close-dirty.svg
View File

@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" enable-background="new 0 0 16 16" height="16" width="16"><circle fill="#424242" cx="8" cy="8" r="4"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 167 B

3
src/vs/workbench/browser/parts/editor/media/close-hc.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 8.70711L11.6465 12.3536L12.3536 11.6465L8.70711 8.00001L12.3536 4.35356L11.6465 3.64645L8.00001 7.2929L4.35356 3.64645L3.64645 4.35356L7.2929 8.00001L3.64645 11.6465L4.35356 12.3536L8.00001 8.70711Z" fill="white"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 376 B

3
src/vs/workbench/browser/parts/editor/media/close-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.00001 8.70711L11.6465 12.3536L12.3536 11.6465L8.70711 8.00001L12.3536 4.35356L11.6465 3.64645L8.00001 7.2929L4.35356 3.64645L3.64645 4.35356L7.2929 8.00001L3.64645 11.6465L4.35356 12.3536L8.00001 8.70711Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 378 B

9
src/vs/workbench/browser/parts/editor/media/editorgroupview.css
View File

@@ -89,15 +89,6 @@
background-repeat: no-repeat;
}
.vs .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
background-image: url('close-light.svg');
}
.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group,
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .editor-group-container-toolbar .close-editor-group {
background-image: url('close-dark.svg');
}
/* Editor */
.monaco-workbench .part.editor > .content .editor-group-container.empty > .editor-container {

12
src/vs/workbench/browser/parts/editor/media/editorstatus.css
View File

@@ -49,15 +49,3 @@
margin-right: 5px;
max-width: fit-content;
}
.vs .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-light.svg') center center no-repeat;
}
.vs-dark .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-dark.svg') center center no-repeat;
}
.hc-black .monaco-workbench .screen-reader-detected-explanation .cancel {
background: url('close-hc.svg') center center no-repeat;
}

36
src/vs/workbench/browser/parts/editor/media/tabstitlecontrol.css
View File

@@ -198,6 +198,12 @@
opacity: 1;
}
/* change close icon to dirty state icon */
.monaco-workbench .part.editor > .content .editor-group-container.active > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before,
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label:not(:hover)::before {
content: "\ea71"; /* use `circle-filled` icon unicode */
}
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.active:hover > .tab-close .action-label, /* show dimmed for inactive group */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty > .tab-close .action-label, /* show dimmed for inactive group */
@@ -216,27 +222,6 @@
margin-right: 0.5em;
}
.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
background: url('close-dirty-light.svg') center center no-repeat;
}
.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action,
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action {
background: url('close-dirty-dark.svg') center center no-repeat;
}
.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-light.svg') center center no-repeat;
}
.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-dark.svg') center center no-repeat;
}
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.dirty .close-editor-action:hover {
background: url('close-hc.svg') center center no-repeat;
}
/* No Tab Close Button */
.monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off {
@@ -254,15 +239,6 @@
padding-right: 28px; /* make room for dirty indication when we are running without close button */
}
.vs .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top) {
background-image: url('close-dirty-light.svg');
}
.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty:not(.dirty-border-top),
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .tabs-container > .tab.close-button-off.dirty {
background-image: url('close-dirty-dark.svg');
}
/* Editor Actions */
.monaco-workbench .part.editor > .content .editor-group-container > .title .editor-actions {

16
src/vs/workbench/browser/parts/editor/media/titlecontrol.css
View File

@@ -54,20 +54,6 @@
cursor: grab;
}
/* Actions */
.monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-light.svg') center center no-repeat;
}
.vs-dark .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-dark.svg') center center no-repeat;
}
.hc-black .monaco-workbench .part.editor > .content .editor-group-container > .title .close-editor-action {
background: url('close-hc.svg') center center no-repeat;
}
/* Drag and Drop Feedback */
.monaco-editor-group-drag-image {
@@ -76,4 +62,4 @@
border-radius: 10px;
font-size: 12px;
position: absolute;
}
}

4
src/vs/workbench/browser/parts/notifications/media/close-all-dark.svg
View File

@@ -1,4 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.62132 8.0858L7.91421 7.37869L6.5 8.7929L5.08579 7.37869L4.37868 8.0858L5.79289 9.50001L4.37868 10.9142L5.08579 11.6213L6.5 10.2071L7.91421 11.6213L8.62132 10.9142L7.20711 9.50001L8.62132 8.0858Z" fill="#C5C5C5"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3L6 2H13L14 3V10L13 11H11V13L10 14H3L2 13V6L3 5H5V3ZM6 5H10L11 6V10H13V3H6V5ZM10 6H3V13H10V6Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 532 B

4
src/vs/workbench/browser/parts/notifications/media/close-all-light.svg
View File

@@ -1,4 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.62132 8.0858L7.91421 7.37869L6.5 8.7929L5.08579 7.37869L4.37868 8.0858L5.79289 9.50001L4.37868 10.9142L5.08579 11.6213L6.5 10.2071L7.91421 11.6213L8.62132 10.9142L7.20711 9.50001L8.62132 8.0858Z" fill="#424242"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M5 3L6 2H13L14 3V10L13 11H11V13L10 14H3L2 13V6L3 5H5V3ZM6 5H10L11 6V10H13V3H6V5ZM10 6H3V13H10V6Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 532 B

3
src/vs/workbench/browser/parts/notifications/media/close-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 8.70708L11.6464 12.3535L12.3536 11.6464L8.70711 7.99998L12.3536 4.35353L11.6464 3.64642L8 7.29287L4.35355 3.64642L3.64645 4.35353L7.29289 7.99998L3.64645 11.6464L4.35355 12.3535L8 8.70708Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 362 B

3
src/vs/workbench/browser/parts/notifications/media/close-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 8.70708L11.6464 12.3535L12.3536 11.6464L8.70711 7.99998L12.3536 4.35353L11.6464 3.64642L8 7.29287L4.35355 3.64642L3.64645 4.35353L7.29289 7.99998L3.64645 11.6464L4.35355 12.3535L8 8.70708Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 362 B

6
src/vs/workbench/browser/parts/notifications/media/configure-dark.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 9.9 KiB

6
src/vs/workbench/browser/parts/notifications/media/configure-light.svg
View File

File diff suppressed because one or more lines are too long
Side by Side

Before

Width:  |  Height:  |  Size: 9.9 KiB

3
src/vs/workbench/browser/parts/notifications/media/error-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.58318 2.02842C9.96435 2.16331 11.2561 2.77279 12.2383 3.75307C13.3643 4.87923 13.9978 6.40584 14 7.99829C14.0004 9.38617 13.5196 10.7313 12.6396 11.8045C11.7595 12.8778 10.5345 13.6127 9.17333 13.8841C7.81215 14.1556 6.39895 13.9467 5.1745 13.2931C3.95005 12.6394 2.99008 11.5815 2.45814 10.2995C1.92619 9.0175 1.85517 7.59072 2.25717 6.26222C2.65917 4.93373 3.50933 3.7857 4.66282 3.0137C5.8163 2.24171 7.20177 1.89351 8.58318 2.02842ZM8.68038 1.03316C10.292 1.19055 11.7993 1.90184 12.9453 3.04585C14.2587 4.35938 14.9976 6.14013 15 7.99764C15.0005 9.61695 14.4396 11.1864 13.4129 12.4385C12.3861 13.6907 10.9569 14.5482 9.36889 14.8648C7.78084 15.1815 6.13211 14.9378 4.70359 14.1752C3.27506 13.4127 2.1551 12.1784 1.53449 10.6828C0.913887 9.18708 0.831027 7.52251 1.30003 5.97259C1.76903 4.42268 2.76089 3.08331 4.10662 2.18265C5.45236 1.28199 7.06873 0.875761 8.68038 1.03316ZM5.52498 5L8.00004 7.47506L10.4751 5L11.1822 5.70711L8.70714 8.18217L11.1818 10.6569L10.4747 11.364L8.00004 8.88927L5.52535 11.364L4.81824 10.6569L7.29293 8.18217L4.81787 5.70711L5.52498 5Z" fill="#F48771"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

3
src/vs/workbench/browser/parts/notifications/media/error-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8.58318 2.02842C9.96435 2.16331 11.2561 2.77279 12.2383 3.75307C13.3643 4.87923 13.9978 6.40584 14 7.99829C14.0004 9.38617 13.5196 10.7313 12.6396 11.8045C11.7595 12.8778 10.5345 13.6127 9.17333 13.8841C7.81215 14.1556 6.39895 13.9467 5.1745 13.2931C3.95005 12.6394 2.99008 11.5815 2.45814 10.2995C1.92619 9.0175 1.85517 7.59072 2.25717 6.26222C2.65917 4.93373 3.50933 3.7857 4.66282 3.0137C5.8163 2.24171 7.20177 1.89351 8.58318 2.02842ZM8.68038 1.03316C10.292 1.19055 11.7993 1.90184 12.9453 3.04585C14.2587 4.35938 14.9976 6.14013 15 7.99764C15.0005 9.61695 14.4396 11.1864 13.4129 12.4385C12.3861 13.6907 10.9569 14.5482 9.36889 14.8648C7.78084 15.1815 6.13211 14.9378 4.70359 14.1752C3.27506 13.4127 2.1551 12.1784 1.53449 10.6828C0.913887 9.18708 0.831027 7.52251 1.30003 5.97259C1.76903 4.42268 2.76089 3.08331 4.10662 2.18265C5.45236 1.28199 7.06873 0.875761 8.68038 1.03316ZM5.52498 5L8.00004 7.47506L10.4751 5L11.1822 5.70711L8.70714 8.18217L11.1818 10.6569L10.4747 11.364L8.00004 8.88927L5.52535 11.364L4.81824 10.6569L7.29293 8.18217L4.81787 5.70711L5.52498 5Z" fill="#A1260D"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 1.2 KiB

3
src/vs/workbench/browser/parts/notifications/media/info-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 7.5C3 4.46243 5.46243 2 8.5 2C11.5376 2 14 4.46243 14 7.5C14 10.5376 11.5376 13 8.5 13C5.46243 13 3 10.5376 3 7.5ZM2 7.5C2 3.91015 4.91015 1 8.5 1C12.0899 1 15 3.91015 15 7.5C15 11.0899 12.0899 14 8.5 14C4.91015 14 2 11.0899 2 7.5ZM8 4V5H9V4H8ZM8 6L8 10H9L9 6H8Z" fill="#75BEFF"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 436 B

4
src/vs/workbench/browser/parts/notifications/media/info-light.svg
View File

@@ -1,4 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 7.5C3 4.46243 5.46243 2 8.5 2C11.5376 2 14 4.46243 14 7.5C14 10.5376 11.5376 13 8.5 13C5.46243 13 3 10.5376 3 7.5ZM2 7.5C2 3.91015 4.91015 1 8.5 1C12.0899 1 15 3.91015 15 7.5C15 11.0899 12.0899 14 8.5 14C4.91015 14 2 11.0899 2 7.5ZM8 4V5H9V4H8ZM8 6L8 10H9L9 6H8Z" fill="#007ACC"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 7.5C3 4.46243 5.46243 2 8.5 2C11.5376 2 14 4.46243 14 7.5C14 10.5376 11.5376 13 8.5 13C5.46243 13 3 10.5376 3 7.5ZM2 7.5C2 3.91015 4.91015 1 8.5 1C12.0899 1 15 3.91015 15 7.5C15 11.0899 12.0899 14 8.5 14C4.91015 14 2 11.0899 2 7.5ZM8 4V5H9V4H8ZM8 6L8 10H9L9 6H8Z" fill="#007ACC"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 769 B

57
src/vs/workbench/browser/parts/notifications/media/notificationsActions.css
View File

@@ -5,7 +5,8 @@
.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .action-label,
.monaco-workbench > .notifications-center > .notifications-center-header > .notifications-center-header-toolbar .action-label {
display: block;
display: flex;
align-items: center;
width: 16px;
height: 22px;
margin-right: 4px;
@@ -13,57 +14,3 @@
background-position: center;
background-repeat: no-repeat;
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action {
background-image: url('close-light.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .clear-notification-action {
background-image: url('close-dark.svg');
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action {
background-image: url('tree-collapsed-light.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .expand-notification-action {
background-image: url('tree-collapsed-dark.svg');
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action {
background-image: url('tree-expanded-light.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .collapse-notification-action {
background-image: url('tree-expanded-dark.svg');
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action {
background-image: url('configure-light.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-toolbar-container .configure-notification-action {
background-image: url('configure-dark.svg');
}
.vs-dark .monaco-workbench > .notifications-center > .notifications-center-header .clear-all-notifications-action,
.hc-black .monaco-workbench > .notifications-center > .notifications-center-header .clear-all-notifications-action {
background-image: url('close-all-dark.svg');
}
.vs .monaco-workbench > .notifications-center > .notifications-center-header .clear-all-notifications-action {
background-image: url('close-all-light.svg');
}
.vs-dark .monaco-workbench > .notifications-center > .notifications-center-header .hide-all-notifications-action,
.hc-black .monaco-workbench > .notifications-center > .notifications-center-header .hide-all-notifications-action {
background-image: url('tree-expanded-dark.svg');
}
.vs .monaco-workbench > .notifications-center > .notifications-center-header .hide-all-notifications-action {
background-image: url('tree-expanded-light.svg');
}

29
src/vs/workbench/browser/parts/notifications/media/notificationsList.css
View File

@@ -32,6 +32,8 @@
/** Notification: Icon */
.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon {
display: flex;
align-items: center;
flex: 0 0 16px;
height: 22px;
margin-right: 4px;
@@ -40,33 +42,6 @@
background-repeat: no-repeat;
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info {
background-image: url('info-light.svg');
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning {
background-image: url('warning-light.svg');
}
.vs .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error {
background-image: url('error-light.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-info {
background-image: url('info-dark.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-warning {
background-image: url('warning-dark.svg');
}
.vs-dark .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error,
.hc-black .monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-icon.icon-error {
background-image: url('error-dark.svg');
}
/** Notification: Message */
.monaco-workbench .notifications-list-container .notification-list-item .notification-list-item-message {

3
src/vs/workbench/browser/parts/notifications/media/tree-collapsed-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.04042L3.02022 11.0202L2.31311 10.3131L7.64645 4.97976L8.35355 4.97976L13.6869 10.3131L12.9798 11.0202L8 6.04042Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 288 B

3
src/vs/workbench/browser/parts/notifications/media/tree-collapsed-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M8 6.04042L3.02022 11.0202L2.31311 10.3131L7.64645 4.97976L8.35355 4.97976L13.6869 10.3131L12.9798 11.0202L8 6.04042Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 288 B

3
src/vs/workbench/browser/parts/notifications/media/tree-expanded-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97603 10.0719L12.3333 5.7146L12.9521 6.33332L8.28539 11L7.66667 11L3 6.33332L3.61872 5.7146L7.97603 10.0719Z" fill="#C5C5C5"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

3
src/vs/workbench/browser/parts/notifications/media/tree-expanded-light.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M7.97603 10.0719L12.3333 5.7146L12.9521 6.33332L8.28539 11L7.66667 11L3 6.33332L3.61872 5.7146L7.97603 10.0719Z" fill="#424242"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 282 B

3
src/vs/workbench/browser/parts/notifications/media/warning-dark.svg
View File

@@ -1,3 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.12 13.9725L15 12.5L9.37927 2H7.61924L1.9985 12.5L2.87852 13.9725H14.12ZM2.87852 12.9725L8.49925 2.47249L14.12 12.9725H2.87852ZM7.98952 6H8.98802V10H7.98952V6ZM7.98952 11H8.98802V12H7.98952V11Z" fill="#FFCC00"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 367 B

4
src/vs/workbench/browser/parts/notifications/media/warning-light.svg
View File

@@ -1,4 +0,0 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.12 13.9725L15 12.5L9.37927 2H7.61924L1.9985 12.5L2.87852 13.9725H14.12ZM2.87852 12.9725L8.49925 2.47249L14.12 12.9725H2.87852ZM7.98952 6H8.98802V10H7.98952V6ZM7.98952 11H8.98802V12H7.98952V11Z" fill="#FFCC00"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.12 13.9725L15 12.5L9.37927 2H7.61924L1.9985 12.5L2.87852 13.9725H14.12ZM2.87852 12.9725L8.49925 2.47249L14.12 12.9725H2.87852ZM7.98952 6H8.98802V10H7.98952V6ZM7.98952 11H8.98802V12H7.98952V11Z" fill="#DDB100"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 631 B

12
src/vs/workbench/browser/parts/notifications/notificationsActions.ts
View File

@@ -23,7 +23,7 @@ export class ClearNotificationAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'clear-notification-action');
super(id, label, 'codicon-close');
}
run(notification: INotificationViewItem): Promise<any> {
@@ -43,7 +43,7 @@ export class ClearAllNotificationsAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'clear-all-notifications-action');
super(id, label, 'codicon-close-all');
}
run(notification: INotificationViewItem): Promise<any> {
@@ -63,7 +63,7 @@ export class HideNotificationsCenterAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'hide-all-notifications-action');
super(id, label, 'codicon-chevron-down');
}
run(notification: INotificationViewItem): Promise<any> {
@@ -83,7 +83,7 @@ export class ExpandNotificationAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'expand-notification-action');
super(id, label, 'codicon-chevron-up');
}
run(notification: INotificationViewItem): Promise<any> {
@@ -103,7 +103,7 @@ export class CollapseNotificationAction extends Action {
label: string,
@ICommandService private readonly commandService: ICommandService
) {
super(id, label, 'collapse-notification-action');
super(id, label, 'codicon-chevron-down');
}
run(notification: INotificationViewItem): Promise<any> {
@@ -123,7 +123,7 @@ export class ConfigureNotificationAction extends Action {
label: string,
private readonly _configurationActions: ReadonlyArray<IAction>
) {
super(id, label, 'configure-notification-action');
super(id, label, 'codicon-gear');
}
get configurationActions(): ReadonlyArray<IAction> {

32
src/vs/workbench/browser/parts/notifications/notificationsList.ts
View File

@@ -8,7 +8,7 @@ import { addClass, isAncestor, trackFocus } from 'vs/base/browser/dom';
import { WorkbenchList } from 'vs/platform/list/browser/listService';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IListOptions } from 'vs/base/browser/ui/list/listWidget';
import { Themable, NOTIFICATIONS_LINKS, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_FOREGROUND } from 'vs/workbench/common/theme';
import { Themable, NOTIFICATIONS_LINKS, NOTIFICATIONS_BACKGROUND, NOTIFICATIONS_FOREGROUND, NOTIFICATIONS_ERROR_ICON_FOREGROUND, NOTIFICATIONS_WARNING_ICON_FOREGROUND, NOTIFICATIONS_INFO_ICON_FOREGROUND } from 'vs/workbench/common/theme';
import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService';
import { contrastBorder, focusBorder } from 'vs/platform/theme/common/colorRegistry';
import { INotificationViewItem } from 'vs/workbench/common/notifications';
@@ -256,4 +256,34 @@ registerThemingParticipant((theme: ITheme, collector: ICssStyleCollector) => {
outline-color: ${focusOutline};
}`);
}
// Notification Error Icon
const notificationErrorIconForegroundColor = theme.getColor(NOTIFICATIONS_ERROR_ICON_FOREGROUND);
if (notificationErrorIconForegroundColor) {
collector.addRule(`
.monaco-workbench .notifications-center .codicon-error,
.monaco-workbench .notifications-toasts .codicon-error {
color: ${notificationErrorIconForegroundColor};
}`);
}
// Notification Warning Icon
const notificationWarningIconForegroundColor = theme.getColor(NOTIFICATIONS_WARNING_ICON_FOREGROUND);
if (notificationWarningIconForegroundColor) {
collector.addRule(`
.monaco-workbench .notifications-center .codicon-warning,
.monaco-workbench .notifications-toasts .codicon-warning {
color: ${notificationWarningIconForegroundColor};
}`);
}
// Notification Info Icon
const notificationInfoIconForegroundColor = theme.getColor(NOTIFICATIONS_INFO_ICON_FOREGROUND);
if (notificationInfoIconForegroundColor) {
collector.addRule(`
.monaco-workbench .notifications-center .codicon-info,
.monaco-workbench .notifications-toasts .codicon-info {
color: ${notificationInfoIconForegroundColor};
}`);
}
});

3
src/vs/workbench/browser/parts/notifications/notificationsViewer.ts
View File

@@ -207,6 +207,7 @@ export class NotificationRenderer implements IListRenderer<INotificationViewItem
// Icon
data.icon = document.createElement('div');
addClass(data.icon, 'notification-list-item-icon');
addClass(data.icon, 'codicon');
// Message
data.message = document.createElement('div');
@@ -362,7 +363,7 @@ export class NotificationTemplateRenderer extends Disposable {
private renderSeverity(notification: INotificationViewItem): void {
NotificationTemplateRenderer.SEVERITIES.forEach(severity => {
const domAction = notification.severity === this.toSeverity(severity) ? addClass : removeClass;
domAction(this.template.icon, `icon-${severity}`);
domAction(this.template.icon, `codicon-${severity}`);
});
}

5
src/vs/workbench/browser/parts/panel/media/panelpart.css
View File

@@ -123,3 +123,8 @@
min-width: 110px;
margin-right: 10px;
}
.monaco-workbench .part.panel.right .title-actions .codicon-chevron-up,
.monaco-workbench .part.panel.right .title-actions .codicon-chevron-down {
transform: rotate(-90deg);
}

8
src/vs/workbench/browser/parts/quickinput/media/quickInput.css
View File

@@ -37,7 +37,7 @@
flex: 1;
}
.quick-input-titlebar .monaco-action-bar .action-label.icon {
.quick-input-titlebar .monaco-action-bar .action-label.codicon {
margin: 0;
width: 19px;
height: 100%;
@@ -212,7 +212,7 @@
overflow: visible;
}
.quick-input-list .quick-input-list-entry-action-bar .action-label.icon {
.quick-input-list .quick-input-list-entry-action-bar .action-label.codicon {
margin: 0;
width: 19px;
height: 100%;
@@ -224,11 +224,11 @@
margin-top: 1px;
}
.quick-input-list .quick-input-list-entry-action-bar ul:first-child .action-label.icon {
.quick-input-list .quick-input-list-entry-action-bar ul:first-child .action-label.codicon {
margin-left: 2px;
}
.quick-input-list .quick-input-list-entry-action-bar ul:last-child .action-label.icon {
.quick-input-list .quick-input-list-entry-action-bar ul:last-child .action-label.codicon {
margin-right: 8px;
}

2
src/vs/workbench/browser/parts/quickinput/quickInput.ts
View File

@@ -1123,7 +1123,7 @@ export class QuickInputService extends Component implements IQuickInputService {
break;
case KeyCode.Tab:
if (!event.altKey && !event.ctrlKey && !event.metaKey) {
const selectors = ['.action-label.icon'];
const selectors = ['.action-label.codicon'];
if (container.classList.contains('show-checkboxes')) {
selectors.push('input');
} else {

14
src/vs/workbench/browser/parts/quickinput/quickInputList.ts
View File

@@ -50,7 +50,7 @@ class ListElement implements IListElement {
saneDescription?: string;
saneDetail?: string;
hidden = false;
private _onChecked = new Emitter<boolean>();
private readonly _onChecked = new Emitter<boolean>();
onChecked = this._onChecked.event;
_checked?: boolean;
get checked() {
@@ -222,17 +222,17 @@ export class QuickInputList {
matchOnDescription = false;
matchOnDetail = false;
matchOnLabel = true;
private _onChangedAllVisibleChecked = new Emitter<boolean>();
private readonly _onChangedAllVisibleChecked = new Emitter<boolean>();
onChangedAllVisibleChecked: Event<boolean> = this._onChangedAllVisibleChecked.event;
private _onChangedCheckedCount = new Emitter<number>();
private readonly _onChangedCheckedCount = new Emitter<number>();
onChangedCheckedCount: Event<number> = this._onChangedCheckedCount.event;
private _onChangedVisibleCount = new Emitter<number>();
private readonly _onChangedVisibleCount = new Emitter<number>();
onChangedVisibleCount: Event<number> = this._onChangedVisibleCount.event;
private _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
private readonly _onChangedCheckedElements = new Emitter<IQuickPickItem[]>();
onChangedCheckedElements: Event<IQuickPickItem[]> = this._onChangedCheckedElements.event;
private _onButtonTriggered = new Emitter<IQuickPickItemButtonEvent<IQuickPickItem>>();
private readonly _onButtonTriggered = new Emitter<IQuickPickItemButtonEvent<IQuickPickItem>>();
onButtonTriggered = this._onButtonTriggered.event;
private _onLeave = new Emitter<void>();
private readonly _onLeave = new Emitter<void>();
onLeave: Event<void> = this._onLeave.event;
private _fireCheckedEvents = true;
private elementDisposables: IDisposable[] = [];

48
src/vs/workbench/browser/parts/titlebar/titlebarPart.ts
View File

@@ -27,7 +27,7 @@ import { Color } from 'vs/base/common/color';
import { trim } from 'vs/base/common/strings';
import { EventType, EventHelper, Dimension, isAncestor, hide, show, removeClass, addClass, append, $, addDisposableListener, runAtThisOrScheduleAtNextAnimationFrame } from 'vs/base/browser/dom';
import { CustomMenubarControl } from 'vs/workbench/browser/parts/titlebar/menubarControl';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
import { IInstantiationService, optional } from 'vs/platform/instantiation/common/instantiation';
import { template } from 'vs/base/common/labels';
import { ILabelService } from 'vs/platform/label/common/label';
import { Event, Emitter } from 'vs/base/common/event';
@@ -35,11 +35,14 @@ import { IStorageService } from 'vs/platform/storage/common/storage';
import { Parts, IWorkbenchLayoutService } from 'vs/workbench/services/layout/browser/layoutService';
import { RunOnceScheduler } from 'vs/base/common/async';
import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
import { Schemas } from 'vs/base/common/network';
import { createAndFillInContextMenuActions } from 'vs/platform/actions/browser/menuEntryActionViewItem';
import { IMenuService, IMenu, MenuId } from 'vs/platform/actions/common/actions';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
// TODO@sbatten https://github.com/microsoft/vscode/issues/81360
// tslint:disable-next-line: import-patterns layering
import { IElectronService } from 'vs/platform/electron/node/electron';
export class TitlebarPart extends Part implements ITitleService {
private static readonly NLS_UNSUPPORTED = nls.localize('patchedWindowTitle', "[Unsupported]");
@@ -96,7 +99,8 @@ export class TitlebarPart extends Part implements ITitleService {
@IStorageService storageService: IStorageService,
@IWorkbenchLayoutService layoutService: IWorkbenchLayoutService,
@IMenuService menuService: IMenuService,
@IContextKeyService contextKeyService: IContextKeyService
@IContextKeyService contextKeyService: IContextKeyService,
@optional(IElectronService) private electronService: IElectronService
) {
super(Parts.TITLEBAR_PART, { hasTitle: false }, themeService, storageService, layoutService);
@@ -176,17 +180,6 @@ export class TitlebarPart extends Part implements ITitleService {
this.activeEditorListeners.add(activeEditor.onDidChangeDirty(() => this.titleUpdater.schedule()));
this.activeEditorListeners.add(activeEditor.onDidChangeLabel(() => this.titleUpdater.schedule()));
}
// Represented File Name
this.updateRepresentedFilename();
}
private updateRepresentedFilename(): void {
const file = toResource(this.editorService.activeEditor, { supportSideBySide: SideBySideEditor.MASTER, filterByScheme: Schemas.file });
const path = file ? file.fsPath : '';
// Apply to window
this.windowService.setRepresentedFilename(path);
}
private doUpdateTitle(): void {
@@ -334,7 +327,7 @@ export class TitlebarPart extends Part implements ITitleService {
this.onUpdateAppIconDragBehavior();
this._register(addDisposableListener(this.appIcon, EventType.DBLCLICK, (e => {
this.windowService.closeWindow();
this.electronService.closeWindow();
})));
}
@@ -358,15 +351,6 @@ export class TitlebarPart extends Part implements ITitleService {
this.titleUpdater.schedule();
}
// Maximize/Restore on doubleclick
if (isMacintosh && !isWeb) {
this._register(addDisposableListener(this.element, EventType.DBLCLICK, e => {
EventHelper.stop(e);
this.onTitleDoubleclick();
}));
}
// Context menu on title
[EventType.CONTEXT_MENU, EventType.MOUSE_DOWN].forEach(event => {
this._register(addDisposableListener(this.title, event, e => {
@@ -387,7 +371,7 @@ export class TitlebarPart extends Part implements ITitleService {
const minimizeIcon = append(minimizeIconContainer, $('div.window-icon'));
addClass(minimizeIcon, 'window-minimize');
this._register(addDisposableListener(minimizeIcon, EventType.CLICK, e => {
this.windowService.minimizeWindow();
this.electronService.minimizeWindow();
}));
// Restore
@@ -395,12 +379,12 @@ export class TitlebarPart extends Part implements ITitleService {
this.maxRestoreControl = append(restoreIconContainer, $('div.window-icon'));
addClass(this.maxRestoreControl, 'window-max-restore');
this._register(addDisposableListener(this.maxRestoreControl, EventType.CLICK, async e => {
const maximized = await this.windowService.isMaximized();
const maximized = await this.electronService.isMaximized();
if (maximized) {
return this.windowService.unmaximizeWindow();
return this.electronService.unmaximizeWindow();
}
return this.windowService.maximizeWindow();
return this.electronService.maximizeWindow();
}));
// Close
@@ -409,7 +393,7 @@ export class TitlebarPart extends Part implements ITitleService {
const closeIcon = append(closeIconContainer, $('div.window-icon'));
addClass(closeIcon, 'window-close');
this._register(addDisposableListener(closeIcon, EventType.CLICK, e => {
this.windowService.closeWindow();
this.electronService.closeWindow();
}));
// Resizer
@@ -417,7 +401,7 @@ export class TitlebarPart extends Part implements ITitleService {
const isMaximized = this.environmentService.configuration.maximized ? true : false;
this.onDidChangeMaximized(isMaximized);
this.windowService.onDidChangeMaximize(this.onDidChangeMaximized, this);
this._register(this.windowService.onDidChangeMaximize(this.onDidChangeMaximized, this));
}
// Since the title area is used to drag the window, we do not want to steal focus from the
@@ -489,10 +473,6 @@ export class TitlebarPart extends Part implements ITitleService {
}
}
private onTitleDoubleclick(): void {
this.windowService.onWindowTitleDoubleClick();
}
private onUpdateAppIconDragBehavior() {
const setting = this.configurationService.getValue('window.doubleClickIconToClose');
if (setting) {

5
src/vs/workbench/browser/parts/views/customView.ts
View File

@@ -308,7 +308,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
getPrimaryActions(): IAction[] {
if (this.showCollapseAllAction) {
const collapseAllAction = new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action collapse-all', true, () => this.tree ? new CollapseAllAction<ITreeItem, ITreeItem, FuzzyScore>(this.tree, true).run() : Promise.resolve());
const collapseAllAction = new Action('vs.tree.collapse', localize('collapseAll', "Collapse All"), 'monaco-tree-action codicon-collapse-all', true, () => this.tree ? new CollapseAllAction<ITreeItem, ITreeItem, FuzzyScore>(this.tree, true).run() : Promise.resolve());
return [...this.menus.getTitleActions(), collapseAllAction];
} else {
return this.menus.getTitleActions();
@@ -608,7 +608,7 @@ export class CustomTreeView extends Disposable implements ITreeView {
private refreshing: boolean = false;
private async doRefresh(elements: ITreeItem[]): Promise<void> {
const tree = this.tree;
if (tree) {
if (tree && this.visible) {
this.refreshing = true;
await Promise.all(elements.map(element => tree.updateChildren(element, true)));
elements.map(element => tree.rerender(element));
@@ -921,4 +921,3 @@ class TreeMenus extends Disposable implements IDisposable {
return result;
}
}

6
src/vs/workbench/browser/parts/views/media/views.css
View File

@@ -52,9 +52,9 @@
/* File icons in trees */
.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.collapsible),
.file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.collapsible),
.file-icon-themable-tree.hide-arrows .monaco-tl-twistie {
.file-icon-themable-tree.align-icons-and-twisties .monaco-tl-twistie:not(.force-twistie):not(.collapsible),
.file-icon-themable-tree .align-icon-with-twisty .monaco-tl-twistie:not(.force-twistie):not(.collapsible),
.file-icon-themable-tree.hide-arrows .monaco-tl-twistie:not(.force-twistie) {
background-image: none !important;
width: 0 !important;
margin-right: 0 !important;

4
src/vs/workbench/browser/parts/views/viewsViewlet.ts
View File

@@ -132,7 +132,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
if (!view) {
this.toggleViewVisibility(id);
}
view = this.getView(id);
view = this.getView(id)!;
view.setExpanded(true);
if (focus) {
view.focus();
@@ -185,7 +185,7 @@ export abstract class ViewContainerViewlet extends PanelViewlet implements IView
return (this.instantiationService as any).createInstance(viewDescriptor.ctorDescriptor.ctor, ...(viewDescriptor.ctorDescriptor.arguments || []), options) as ViewletPanel;
}
protected getView(id: string): ViewletPanel {
protected getView(id: string): ViewletPanel | undefined {
return this.panels.filter(view => view.id === id)[0];
}