From 19ae9afa1aadf25c2a4a179b8fdbb1bdd54e12bc Mon Sep 17 00:00:00 2001 From: Anton Kozub Date: Thu, 10 Oct 2024 11:38:14 +0200 Subject: [PATCH] IDEA-354490 small improvements GitOrigin-RevId: 7689f2c636ad1a944bf72b29f81fcfc7fd03a157 --- .../newStructureView/StructureViewFloatingToolbar.kt | 1 + .../logical/impl/LogicalStructureViewModel.kt | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewFloatingToolbar.kt b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewFloatingToolbar.kt index 8df687c1bb67..025ecc95d7cd 100644 --- a/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewFloatingToolbar.kt +++ b/platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureViewFloatingToolbar.kt @@ -53,6 +53,7 @@ internal class StructureViewFloatingToolbar( init(ownerComponent) showingTime = 150 hidingTime = 50 + backgroundAlpha = 1F border = BorderFactory.createEmptyBorder() } } \ No newline at end of file diff --git a/platform/structure-view-impl/src/com/intellij/ide/structureView/logical/impl/LogicalStructureViewModel.kt b/platform/structure-view-impl/src/com/intellij/ide/structureView/logical/impl/LogicalStructureViewModel.kt index 0d15d288acd9..6791eeded6ea 100644 --- a/platform/structure-view-impl/src/com/intellij/ide/structureView/logical/impl/LogicalStructureViewModel.kt +++ b/platform/structure-view-impl/src/com/intellij/ide/structureView/logical/impl/LogicalStructureViewModel.kt @@ -40,7 +40,7 @@ class LogicalStructureViewModel private constructor(psiFile: PsiFile, editor: Ed } override fun isAlwaysLeaf(element: StructureViewTreeElement?): Boolean { - return element is ElementsBuilder.PropertyPsiElementStructureElement<*> || element is ElementsBuilder.PropertyStructureElement + return element is ElementsBuilder.PropertyStructureElement } override fun isAutoExpand(element: StructureViewTreeElement): Boolean { @@ -307,7 +307,7 @@ private class ElementsBuilder { override fun getIcon(open: Boolean): Icon? = getPresentation().getIcon(open) override fun getChildrenBase(): Collection { - return emptyList() // getChildrenNodes (assembledModel, parentKey + "." + assembledModel.model.hashCode()) + return getChildrenNodes(assembledModel) } override fun isAllowExtensions(): Boolean = false @@ -335,7 +335,8 @@ private class ElementsBuilder { override fun getPresentation(): ItemPresentation = getPropertyPresentationData(grouper, assembledModel.model!!) override fun getChildren(): Array { - return getChildrenNodes(assembledModel).toTypedArray() + //return getChildrenNodes(assembledModel).toTypedArray() + return emptyArray() } override fun equals(other: Any?): Boolean {