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

Fix #28634

Browse Source
This commit is contained in:
Sandeep Somavarapu
2018-01-15 18:10:40 +01:00
parent 504b84187f
commit 5f1973e275
2 changed files with 45 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/browser/parts/views/media/views.css
+24 -6
View File
@@ -53,23 +53,24 @@
display: none;
}
.custom-view-tree-node-item {
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item {
display: flex;
height: 22px;
line-height: 22px;
}
.custom-view-tree-node-item > .custom-view-tree-node-item-resourceLabel {
flex: 1;
text-overflow: ellipsis;
overflow: hidden;
flex-wrap: nowrap
}
.custom-view-tree-node-item > .custom-view-tree-node-item-label {
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item .custom-view-tree-node-item-resourceLabel,
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-label {
flex: 1;
text-overflow: ellipsis;
overflow: hidden;
}
.custom-view-tree-node-item > .custom-view-tree-node-item-icon {
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .custom-view-tree-node-item-icon {
background-size: 16px;
background-position: left center;
background-repeat: no-repeat;
@@ -77,4 +78,21 @@
width: 16px;
height: 22px;
-webkit-font-smoothing: antialiased;
}
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row .custom-view-tree-node-item > .actions {
display: none;
}
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row:hover .custom-view-tree-node-item > .actions,
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.selected .custom-view-tree-node-item > .actions,
.tree-explorer-viewlet-tree-view .monaco-tree .monaco-tree-row.focused .custom-view-tree-node-item > .actions {
display: block;
}
.tree-explorer-viewlet-tree-view .monaco-tree .custom-view-tree-node-item > .actions .action-label {
width: 16px;
height: 100%;
background-position: 50% 50%;
background-repeat: no-repeat;
}
src/vs/workbench/browser/parts/views/treeView.ts
+21 -6
View File
@@ -21,7 +21,7 @@ import { createActionItem, fillInActions } from 'vs/platform/actions/browser/men
import { IProgressService } from 'vs/platform/progress/common/progress';
import { ITree, IDataSource, IRenderer, ContextMenuEvent } from 'vs/base/parts/tree/browser/tree';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import { ActionItem } from 'vs/base/browser/ui/actionbar/actionbar';
import { ActionItem, ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
import { ViewsRegistry } from 'vs/workbench/browser/parts/views/viewsRegistry';
import { IExtensionService } from 'vs/platform/extensions/common/extensions';
import { IViewletViewOptions, IViewOptions, TreeViewsViewletPanel, FileIconThemableWorkbenchTree } from 'vs/workbench/browser/parts/views/viewsViewlet';
@@ -90,7 +90,7 @@ export class TreeView extends TreeViewsViewletPanel {
public createViewer(container: Builder): WorkbenchTree {
const dataSource = this.instantiationService.createInstance(TreeDataSource, this.id);
const renderer = this.instantiationService.createInstance(TreeRenderer);
const renderer = this.instantiationService.createInstance(TreeRenderer, this.id, this.menus);
const controller = this.instantiationService.createInstance(TreeController, this.id, this.menus);
const tree = new FileIconThemableWorkbenchTree(
container.getHTMLElement(),
@@ -271,6 +271,7 @@ interface ITreeExplorerTemplateData {
label: HTMLElement;
resourceLabel: ResourceLabel;
icon: HTMLElement;
actionBar: ActionBar;
}
class TreeRenderer implements IRenderer {
@@ -279,6 +280,8 @@ class TreeRenderer implements IRenderer {
private static readonly TREE_TEMPLATE_ID = 'treeExplorer';
constructor(
private treeViewId: string,
private menus: Menus,
@IInstantiationService private instantiationService: IInstantiationService,
@IThemeService private themeService: IThemeService
) {
@@ -297,10 +300,13 @@ class TreeRenderer implements IRenderer {
const icon = DOM.append(el, DOM.$('.custom-view-tree-node-item-icon'));
const label = DOM.append(el, DOM.$('.custom-view-tree-node-item-label'));
const resourceLabelContainer = DOM.append(el, DOM.$('.custom-view-tree-node-item-resourceLabelContainer'));
const resourceLabel = this.instantiationService.createInstance(ResourceLabel, resourceLabelContainer, { supportHighlights: true });
const resourceLabel = this.instantiationService.createInstance(ResourceLabel, el, {});
const actionsContainer = DOM.append(el, DOM.$('.actions'));
const actionBar = new ActionBar(actionsContainer, {
actionRunner: new MultipleSelectionActionRunner(() => tree.getSelection())
});
return { label, resourceLabel, icon };
return { label, resourceLabel, icon, actionBar };
}
public renderElement(tree: ITree, node: ITreeItem, templateId: string, templateData: ITreeExplorerTemplateData): void {
@@ -309,7 +315,9 @@ class TreeRenderer implements IRenderer {
const theme = this.themeService.getTheme();
const icon = theme.type === LIGHT ? node.icon : node.iconDark;
// reset
templateData.resourceLabel.clear();
templateData.actionBar.clear();
templateData.label.textContent = '';
DOM.removeClass(templateData.label, 'custom-view-tree-node-item-label');
DOM.removeClass(templateData.resourceLabel.element, 'custom-view-tree-node-item-resourceLabel');
@@ -326,6 +334,9 @@ class TreeRenderer implements IRenderer {
DOM.addClass(templateData.icon, 'custom-view-tree-node-item-icon');
}
}
templateData.actionBar.context = (<TreeViewItemHandleArg>{ $treeViewId: this.treeViewId, $treeItemHandle: node.handle });
templateData.actionBar.push(this.menus.getResourceActions(node), { icon: true, label: false });
}
public disposeTemplate(tree: ITree, templateId: string, templateData: ITreeExplorerTemplateData): void {
@@ -458,6 +469,10 @@ class Menus implements IDisposable {
return this.titleSecondaryActions;
}
getResourceActions(element: ITreeItem): IAction[] {
return this.getActions(MenuId.ViewItemContext, { key: 'viewItem', value: element.contextValue }).primary;
}
getResourceContextActions(element: ITreeItem): IAction[] {
return this.getActions(MenuId.ViewItemContext, { key: 'viewItem', value: element.contextValue }).secondary;
}
@@ -471,7 +486,7 @@ class Menus implements IDisposable {
const primary: IAction[] = [];
const secondary: IAction[] = [];
const result = { primary, secondary };
fillInActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService);
fillInActions(menu, { shouldForwardArgs: true }, result, this.contextMenuService, g => /^inline/.test(g));
menu.dispose();
contextKeyService.dispose();