From 5755810a58ac76ffedb037647f1cd6fec406efe9 Mon Sep 17 00:00:00 2001 From: Sandeep Somavarapu Date: Tue, 6 Feb 2018 15:54:29 +0100 Subject: [PATCH] Fix #42097 --- .../workbench/browser/parts/views/treeView.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/vs/workbench/browser/parts/views/treeView.ts b/src/vs/workbench/browser/parts/views/treeView.ts index 029fc406e03..1d72da717c1 100644 --- a/src/vs/workbench/browser/parts/views/treeView.ts +++ b/src/vs/workbench/browser/parts/views/treeView.ts @@ -379,6 +379,10 @@ class Aligner extends Disposable { } private hasToAlignWithTwisty(): boolean { + if (this.hasParentHasIcon()) { + return false; + } + const fileIconTheme = this.themeService.getFileIconTheme(); if (!(fileIconTheme.hasFileIcons && !fileIconTheme.hasFolderIcons)) { return false; @@ -407,6 +411,21 @@ class Aligner extends Disposable { const parent: ITreeItem = this.tree.getNavigator(this.node).parent() || this.tree.getInput(); return parent.children; } + + private hasParentHasIcon(): boolean { + const parent = this.tree.getNavigator(this.node).parent() || this.tree.getInput(); + const icon = this.themeService.getTheme().type === LIGHT ? parent.icon : parent.iconDark; + if (icon) { + return true; + } + if (parent.resourceUri) { + const fileIconTheme = this.themeService.getFileIconTheme(); + if (fileIconTheme.hasFileIcons && fileIconTheme.hasFolderIcons) { + return true; + } + } + return false; + } } class TreeController extends WorkbenchTreeController { -- GitLab