Changeset 15280 for branches/Async/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

Timestamp:

07/23/17 00:52:14 (7 years ago)

Author:

abeham

Message:

#2258: merged r13329:14000 from trunk into branch

Location:

branches/Async

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (7 diffs)

branches/Async/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -93 +93 @@
     }
 
+    #region Create Tree
     private TreeNode CreateCategoryTree(IEnumerable<IGrouping<string, Type>> categories) {
       imageList.Images.Add(VSImageLibrary.Class);      // default icon
@@ -176 +177 @@
       return itemNode;
     }
+    #endregion
 
     private void NewItemDialog_Shown(object sender, EventArgs e) {
-      searchTextBox.Text = string.Empty;
-      searchTextBox.Focus();
-      SelectedType = null;
-      typesTreeView.SelectedNode = null;
-      UpdateDescription();
-
-      foreach (TreeNode node in typesTreeView.Nodes)
-        node.Expand();
-      typesTreeView.Nodes[0].EnsureVisible();
+      Reset();
     }
 
@@ -221 +215 @@
         // select first item
         typesTreeView.BeginUpdate();
+        typesTreeView.ExpandAll();
         var firstNode = FirstVisibleNode;
         while (firstNode != null && !(firstNode.Tag is Type))
@@ -243 +238 @@
     private bool FilterNode(TreeNode node, string[] searchTokens) {
       if (node.Tag is string) { // Category node
-        int i = 0;
-        while (i < node.Nodes.Count) {
-          bool remove = FilterNode(node.Nodes[i], searchTokens);
-          if (remove)
-            node.Nodes.RemoveAt(i);
-          else i++;
+        var text = node.Text;
+        if (searchTokens.Any(token => !text.ToLower().Contains(token))) {
+          int i = 0;
+          while (i < node.Nodes.Count) {
+            bool remove = FilterNode(node.Nodes[i], searchTokens);
+            if (remove)
+              node.Nodes.RemoveAt(i);
+            else i++;
+          }
         }
         return node.Nodes.Count == 0;
-      } if (node.Tag is Type) { // Type node
+      }
+      if (node.Tag is Type) { // Type node
         var text = node.Text;
         if (searchTokens.Any(searchToken => !text.ToLower().Contains(searchToken))) {
@@ -308 +307 @@
     protected virtual void searchTextBox_TextChanged(object sender, EventArgs e) {
       Filter(searchTextBox.Text);
+      if (string.IsNullOrWhiteSpace(searchTextBox.Text))
+        Reset();
     }
 
@@ -333 +334 @@
     private void SetTreeNodeVisibility() {
       TreeNode selectedNode = typesTreeView.SelectedNode;
-      if (string.IsNullOrEmpty(currentSearchString) && (typesTreeView.Nodes.Count > 1)) {
+      if (string.IsNullOrWhiteSpace(currentSearchString) && (typesTreeView.Nodes.Count > 1)) {
         typesTreeView.CollapseAll();
         if (selectedNode != null) typesTreeView.SelectedNode = selectedNode;
@@ -339 +340 @@
         typesTreeView.ExpandAll();
       }
-      if (selectedNode != null) selectedNode.EnsureVisible();
+      if (selectedNode != null) {
+        typesTreeView.Nodes[0].EnsureVisible(); // scroll top first
+        selectedNode.EnsureVisible();
+      }
+    }
+    private void Reset() {
+      searchTextBox.Text = string.Empty;
+      searchTextBox.Focus();
+      SelectedType = null;
+      typesTreeView.SelectedNode = null;
+      UpdateDescription();
+
+      typesTreeView.BeginUpdate();
+      typesTreeView.CollapseAll();
+      foreach (TreeNode node in typesTreeView.Nodes)
+        node.Expand();
+      typesTreeView.Nodes[0].EnsureVisible();
+      typesTreeView.EndUpdate();
     }
     #endregion