Skip to content

Commit ec02bcd

Browse files
aeschliaeschli
committed
codicon definitions in browser/ui/codicon/codicon
1 parent b02307e commit ec02bcd

30 files changed

Lines changed: 552 additions & 438 deletions

File tree

‎build/gulpfile.editor.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ let editorEntryPoints = [
4343
];
4444

4545
let editorResources = [
46-
'out-editor-build/vs/base/browser/ui/codiconLabel/**/*.ttf'
46+
'out-editor-build/vs/base/browser/ui/codicons/**/*.ttf'
4747
];
4848

4949
let BUNDLED_FILE_HEADER = [

‎build/gulpfile.vscode.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ const vscodeResources = [
6565
'out-build/vs/base/common/performance.js',
6666
'out-build/vs/base/node/languagePacks.js',
6767
'out-build/vs/base/node/{stdForkStart.js,terminateProcess.sh,cpuUsage.sh,ps.sh}',
68-
'out-build/vs/base/browser/ui/codiconLabel/codicon/**',
68+
'out-build/vs/base/browser/ui/codicons/codicon/**',
6969
'out-build/vs/workbench/browser/media/*-theme.css',
7070
'out-build/vs/workbench/contrib/debug/**/*.json',
7171
'out-build/vs/workbench/contrib/externalTerminal/**/*.scpt',

‎src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
outline: none;
2626
}
2727

28-
.monaco-breadcrumbs .monaco-breadcrumb-item .codicon-chevron-right {
28+
.monaco-breadcrumbs .monaco-breadcrumb-item .codicon-breadcrumb-separator {
2929
color: inherit;
3030
}
3131

‎src/vs/base/browser/ui/breadcrumbs/breadcrumbsWidget.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { Color } from 'vs/base/common/color';
1111
import { Emitter, Event } from 'vs/base/common/event';
1212
import { dispose, IDisposable, DisposableStore } from 'vs/base/common/lifecycle';
1313
import { ScrollbarVisibility } from 'vs/base/common/scrollable';
14+
import { Codicon, registerIcon } from 'vs/base/browser/ui/codicons/codicons';
1415
import 'vs/css!./breadcrumbsWidget';
1516

1617
export abstract class BreadcrumbsItem {
@@ -55,6 +56,8 @@ export interface IBreadcrumbsItemEvent {
5556
payload: any;
5657
}
5758

59+
const breadcrumbSeparatorIcon = registerIcon('breadcrumb-separator', Codicon.chevronRight);
60+
5861
export class BreadcrumbsWidget {
5962

6063
private readonly _disposables = new DisposableStore();
@@ -336,7 +339,7 @@ export class BreadcrumbsWidget {
336339
container.tabIndex = -1;
337340
container.setAttribute('role', 'listitem');
338341
dom.addClasses(container, 'monaco-breadcrumb-item');
339-
const iconContainer = dom.$('.codicon.codicon-chevron-right');
342+
const iconContainer = dom.$(breadcrumbSeparatorIcon.cssSelector);
340343
container.appendChild(iconContainer);
341344
}
342345

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

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@ import { Widget } from 'vs/base/browser/ui/widget';
1010
import { Color } from 'vs/base/common/color';
1111
import { Emitter, Event } from 'vs/base/common/event';
1212
import { KeyCode } from 'vs/base/common/keyCodes';
13-
import * as objects from 'vs/base/common/objects';
1413
import { BaseActionViewItem } from 'vs/base/browser/ui/actionbar/actionbar';
1514
import { DisposableStore } from 'vs/base/common/lifecycle';
15+
import { Codicon } from 'vs/base/browser/ui/codicons/codicons';
1616

1717
export interface ICheckboxOpts extends ICheckboxStyles {
1818
readonly actionClassName?: string;
19+
readonly icon?: Codicon;
1920
readonly title: string;
2021
readonly isChecked: boolean;
2122
}
@@ -93,13 +94,23 @@ export class Checkbox extends Widget {
9394
constructor(opts: ICheckboxOpts) {
9495
super();
9596

96-
this._opts = objects.deepClone(opts);
97-
objects.mixin(this._opts, defaultOpts, false);
97+
this._opts = { ...defaultOpts, ...opts };
9898
this._checked = this._opts.isChecked;
9999

100+
const classes = ['monaco-custom-checkbox'];
101+
if (this._opts.icon) {
102+
classes.push(this._opts.icon.className);
103+
} else {
104+
classes.push('codicon'); // todo: remove once codicon fully adopted
105+
}
106+
if (this._opts.actionClassName) {
107+
classes.push(this._opts.actionClassName);
108+
}
109+
classes.push(this._checked ? 'checked' : 'unchecked');
110+
100111
this.domNode = document.createElement('div');
101112
this.domNode.title = this._opts.title;
102-
this.domNode.className = 'monaco-custom-checkbox codicon ' + (this._opts.actionClassName || '') + ' ' + (this._checked ? 'checked' : 'unchecked');
113+
this.domNode.className = classes.join(' ');
103114
this.domNode.tabIndex = 0;
104115
this.domNode.setAttribute('role', 'checkbox');
105116
this.domNode.setAttribute('aria-checked', String(this._checked));
@@ -192,7 +203,7 @@ export class SimpleCheckbox extends Widget {
192203
constructor(private title: string, private isChecked: boolean) {
193204
super();
194205

195-
this.checkbox = new Checkbox({ title: this.title, isChecked: this.isChecked, actionClassName: 'monaco-simple-checkbox codicon-check' });
206+
this.checkbox = new Checkbox({ title: this.title, isChecked: this.isChecked, icon: Codicon.check, actionClassName: 'monaco-simple-checkbox' });
196207

197208
this.domNode = this.checkbox.domNode;
198209

src/vs/base/browser/ui/codiconLabel/codicon/codicon-animations.css renamed to src/vs/base/browser/ui/codicons/codicon/codicon-animations.css

File renamed without changes.

src/vs/base/browser/ui/codiconLabel/codicon/codicon-modifications.css renamed to src/vs/base/browser/ui/codicons/codicon/codicon-modifications.css

File renamed without changes.

src/vs/base/browser/ui/codiconLabel/codicon/codicon.css renamed to src/vs/base/browser/ui/codicons/codicon/codicon.css

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@
8282
.codicon-git-fork-private:before { content: "\ea75" }
8383
.codicon-lock:before { content: "\ea75" }
8484
.codicon-mirror-private:before { content: "\ea75" }
85+
.codicon-list-close:before,
8586
.codicon-close:before { content: "\ea76" }
8687
.codicon-remove-close:before { content: "\ea76" }
8788
.codicon-x:before { content: "\ea76" }
@@ -95,6 +96,8 @@
9596
.codicon-device-desktop:before { content: "\ea7a" }
9697
.codicon-file:before { content: "\ea7b" }
9798
.codicon-file-text:before { content: "\ea7b" }
99+
.codicon-toolbar-more:before,
100+
.codicon-menubar-more:before,
98101
.codicon-more:before { content: "\ea7c" }
99102
.codicon-ellipsis:before { content: "\ea7c" }
100103
.codicon-kebab-horizontal:before { content: "\ea7c" }
@@ -181,10 +184,15 @@
181184
.codicon-bug:before { content: "\eaaf" }
182185
.codicon-calendar:before { content: "\eab0" }
183186
.codicon-case-sensitive:before { content: "\eab1" }
187+
188+
.codicon-menu-selection:before,
184189
.codicon-check:before { content: "\eab2" }
185190
.codicon-checklist:before { content: "\eab3" }
186191
.codicon-chevron-down:before { content: "\eab4" }
187192
.codicon-chevron-left:before { content: "\eab5" }
193+
194+
.codicon-menu-submenu:before,
195+
.codicon-breadcrumb-separator:before,
188196
.codicon-chevron-right:before { content: "\eab6" }
189197
.codicon-chevron-up:before { content: "\eab7" }
190198
.codicon-chrome-close:before { content: "\eab8" }
@@ -370,9 +378,13 @@
370378
.codicon-thumbsdown:before { content: "\eb6b" }
371379
.codicon-thumbsup:before { content: "\eb6c" }
372380
.codicon-tools:before { content: "\eb6d" }
381+
.codicon-scrollbar-button-down:before,
373382
.codicon-triangle-down:before { content: "\eb6e" }
383+
.codicon-scrollbar-button-left:before,
374384
.codicon-triangle-left:before { content: "\eb6f" }
385+
.codicon-scrollbar-button-right:before,
375386
.codicon-triangle-right:before { content: "\eb70" }
387+
.codicon-scrollbar-button-up:before,
376388
.codicon-triangle-up:before { content: "\eb71" }
377389
.codicon-twitter:before { content: "\eb72" }
378390
.codicon-unfold:before { content: "\eb73" }
@@ -393,7 +405,10 @@
393405
.codicon-zoom-out:before { content: "\eb82" }
394406
.codicon-list-filter:before { content: "\eb83" }
395407
.codicon-list-flat:before { content: "\eb84" }
408+
.codicon-search-show-context:before,
396409
.codicon-list-selection:before { content: "\eb85" }
410+
411+
.codicon-find-selection:before,
397412
.codicon-selection:before { content: "\eb85" }
398413
.codicon-list-tree:before { content: "\eb86" }
399414
.codicon-debug-breakpoint-function-unverified:before { content: "\eb87" }

src/vs/base/browser/ui/codiconLabel/codicon/codicon.ttf renamed to src/vs/base/browser/ui/codicons/codicon/codicon.ttf

File renamed without changes.

src/vs/base/browser/ui/codiconLabel/codiconLabel.ts renamed to src/vs/base/browser/ui/codicons/codiconLabel.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import 'vs/css!./codicon/codicon';
7-
import 'vs/css!./codicon/codicon-modifications';
8-
import 'vs/css!./codicon/codicon-animations';
96
import { escape } from 'vs/base/common/strings';
107
import { renderCodicons } from 'vs/base/common/codicons';
118

0 commit comments

Comments
 (0)