Merge branch 'tree-ui'

This commit is contained in:
Kirill Kalishev
2009-10-01 16:06:58 +04:00
@@ -11,6 +11,7 @@ import com.intellij.openapi.fileChooser.FileElement;
import com.intellij.openapi.fileChooser.ex.RootFileElement;
import com.intellij.openapi.progress.ProgressIndicator;
import com.intellij.openapi.progress.util.StatusBarProgress;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.openapi.vfs.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -87,7 +88,14 @@ public class FileTreeBuilder extends AbstractTreeBuilder {
}
protected boolean isAutoExpandNode(NodeDescriptor nodeDescriptor) {
return nodeDescriptor.getElement() instanceof RootFileElement;
if (nodeDescriptor.getElement() instanceof RootFileElement) {
return true;
} else if (!SystemInfo.isWindows) {
NodeDescriptor parent = nodeDescriptor.getParentDescriptor();
return parent != null && parent.getElement() instanceof RootFileElement;
}
return false;
}
@NotNull