提交 1c73dd5c 编写于 作者: J Johannes Rieken

detail all the way

上级 8f3d4293
......@@ -69,9 +69,9 @@ export class QuickOpenEntry {
}
/**
* Meta information about the entry that is optional and can be shown below the label
* Detail information about the entry that is optional and can be shown below the label
*/
public getMeta(): string {
public getDetail(): string {
return null;
}
......@@ -359,8 +359,8 @@ export class QuickOpenEntryGroup extends QuickOpenEntry {
return this.entry ? this.entry.getLabel() : super.getLabel();
}
public getMeta(): string {
return this.entry ? this.entry.getMeta() : super.getMeta();
public getDetail(): string {
return this.entry ? this.entry.getDetail() : super.getDetail();
}
public getResource(): URI {
......@@ -447,7 +447,7 @@ export interface IQuickOpenEntryTemplateData {
icon: HTMLSpanElement;
prefix: HTMLSpanElement;
label: HighlightedLabel;
meta: OcticonLabel;
detail: OcticonLabel;
description: HighlightedLabel;
actionBar: ActionBar;
}
......@@ -472,7 +472,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
if (entry instanceof QuickOpenEntryItem) {
return (<QuickOpenEntryItem>entry).getHeight();
}
if (entry.getMeta()) {
if (entry.getDetail()) {
return 44;
}
return 22;
......@@ -542,18 +542,18 @@ class Renderer implements IRenderer<QuickOpenEntry> {
DOM.addClass(descriptionContainer, 'quick-open-entry-description');
let description = new HighlightedLabel(descriptionContainer);
// Meta
// Detail
let metaContainer = document.createElement('div');
entry.appendChild(metaContainer);
DOM.addClass(metaContainer, 'quick-open-entry-meta');
let meta = new OcticonLabel(metaContainer);
let detail = new OcticonLabel(metaContainer);
return {
container,
icon,
prefix,
label,
meta,
detail,
description,
group,
actionBar
......@@ -621,7 +621,7 @@ class Renderer implements IRenderer<QuickOpenEntry> {
data.label.set(entry.getLabel() || '', labelHighlights || []);
// Meta
data.meta.text = entry.getMeta();
data.detail.text = entry.getDetail();
// Description
let descriptionHighlights = highlights[1];
......
......@@ -51,20 +51,20 @@ export class ExtHostQuickOpen {
let item = items[handle];
let label: string;
let description: string;
let meta: string;
let detail: string;
if (typeof item === 'string') {
label = item;
} else {
label = item.label;
description = item.description;
meta = item.detail;
detail = item.detail;
}
pickItems.push({
label,
description,
handle,
meta
detail
});
}
......
......@@ -278,7 +278,7 @@ export class QuickOpenController extends WorkbenchComponent implements IQuickOpe
return new PickOpenItem(entry.label, entry.description, entry.height, entry.render.bind(entry), () => progress(e));
}
return new PickOpenEntry(entry.label, entry.description, entry.meta, () => progress(e));
return new PickOpenEntry(entry.label, entry.description, entry.detail, () => progress(e));
});
if (picks.length === 0) {
......@@ -853,13 +853,13 @@ class PlaceholderQuickOpenEntry extends QuickOpenEntry {
class PickOpenEntry extends PlaceholderQuickOpenEntry {
private _selected: boolean;
private description: string;
private meta: string;
private detail: string;
constructor(label: string, description?: string, meta?: string, private onPreview?: () => void) {
constructor(label: string, description?: string, detail?: string, private onPreview?: () => void) {
super(label);
this.description = description;
this.meta = meta;
this.detail = detail;
}
public get selected(): boolean {
......@@ -870,8 +870,8 @@ class PickOpenEntry extends PlaceholderQuickOpenEntry {
return this.description;
}
public getMeta(): string {
return this.meta;
public getDetail(): string {
return this.detail;
}
public run(mode: Mode, context: IContext): boolean {
......
......@@ -14,7 +14,7 @@ export interface IPickOpenEntry {
id?: string;
label: string;
description?: string;
meta?: string;
detail?: string;
}
export interface IPickOptions {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册