From 481243d0fe5fd5655a6e41d89121c1bbf1e07024 Mon Sep 17 00:00:00 2001 From: Sergey Malenkov Date: Sat, 17 Sep 2016 18:47:13 +0300 Subject: [PATCH] IDEA-152049 Favorites collapses in unpinned mode after some time and changes in editor --- .../com/intellij/ide/projectView/BaseProjectTreeBuilder.java | 2 ++ .../src/com/intellij/ide/util/treeView/AbstractTreeUi.java | 2 +- platform/util/resources/misc/registry.properties | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java index 634ede7944ad..989c74b6b295 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/BaseProjectTreeBuilder.java @@ -28,6 +28,7 @@ import com.intellij.openapi.progress.Progressive; import com.intellij.openapi.progress.util.StatusBarProgress; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; +import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.FocusRequestor; import com.intellij.openapi.wm.IdeFocusManager; @@ -59,6 +60,7 @@ public abstract class BaseProjectTreeBuilder extends AbstractTreeBuilder { @NotNull AbstractTreeStructure treeStructure, @Nullable Comparator comparator) { init(tree, treeModel, treeStructure, comparator, DEFAULT_UPDATE_INACTIVE); + getUi().setClearOnHideDelay(Registry.intValue("ide.tree.clearOnHideTime")); myProject = project; } diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java index 0d8bba6ed590..edeff2e1eb9c 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeUi.java @@ -2299,7 +2299,7 @@ public class AbstractTreeUi { } public long getClearOnHideDelay() { - return myClearOnHideDelay > 0 ? myClearOnHideDelay : Registry.intValue("ide.tree.clearOnHideTime"); + return myClearOnHideDelay; } @NotNull diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties index 7c1550000f12..5066bae4cfa0 100644 --- a/platform/util/resources/misc/registry.properties +++ b/platform/util/resources/misc/registry.properties @@ -105,7 +105,10 @@ passwordSafe.memorySafe.ttl=-1 ide.tree.yieldingUiUpdate=true ide.tree.showBusyIndicator=true ide.tree.waitForReadyTimeout=250 + ide.tree.clearOnHideTime=120000 +ide.tree.clearOnHideTime.description=Time in milliseconds when the hidden project view tree will be deactivated. + ide.tree.autoscrollToVCenter=true ide.tree.ensureSelectionOnFocusGained=true ide.tree.autoExpandMaxDepth=5