Changeset 12234 for branches/NewItemDialog

Timestamp:

03/23/15 10:01:26 (10 years ago)

Author:

pfleck

Message:

#2025 Enabled selecting nodes with arrow-up and -down while focusing the search box.

File:

• branches/NewItemDialog/HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (3 diffs)

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

@@ -130 +130 @@
       return parentNode;
     }
-
     private void CreateItemNodes(TreeNode node, IEnumerable<IGrouping<string, Type>> categories) {
       foreach (var category in categories) {
@@ -141 +140 @@
       }
     }
-
     private TreeNode CreateItemNode(Type creatable) {
       string name = ItemAttribute.GetName(creatable);
@@ -387 +385 @@
 
     private void searchTextBox_KeyDown(object sender, KeyEventArgs e) {
+      if (typesTreeView.Nodes.Count == 0)
+        return;
+
       if (e.KeyCode == Keys.Up || e.KeyCode == Keys.Down) {
-
-        int? idx = typesTreeView.SelectedNode != null
-          ? (int?)typesTreeView.SelectedNode.Index
-          : null;
-
-        TreeNode newNode = null;
-        if (e.KeyCode == Keys.Down) {
-          if (idx.HasValue && idx < typesTreeView.Nodes.Count - 1) {
-            newNode = typesTreeView.Nodes[idx.Value + 1];
-          } else if (typesTreeView.Nodes.Count > 0) {
-            newNode = typesTreeView.Nodes[0];
-          }
-        } else if (e.KeyCode == Keys.Up && idx.HasValue && idx > 0) {
-          newNode = typesTreeView.Nodes[idx.Value - 1];
-        }
-
-        if (newNode != null)
-          typesTreeView.SelectedNode = newNode;
+        var selectedNode = typesTreeView.SelectedNode;
+
+        if (selectedNode == null) { // nothing selected => select first or last
+          if (e.KeyCode == Keys.Down) typesTreeView.SelectedNode = FirstVisibleNode;
+          if (e.KeyCode == Keys.Up) typesTreeView.SelectedNode = LastVisibleNode;
+        } else {
+          if (e.KeyCode == Keys.Down)
+            typesTreeView.SelectedNode = selectedNode.NextVisibleNode ?? FirstVisibleNode; // select next or cycle to first
+          if (e.KeyCode == Keys.Up)
+            typesTreeView.SelectedNode = selectedNode.PrevVisibleNode ?? LastVisibleNode; // select prev or cycle to last
+        }
         e.Handled = true;
+      }
+    }
+
+    private TreeNode FirstVisibleNode {
+      get {
+        return typesTreeView.Nodes[0];
+      }
+    }
+    private TreeNode LastVisibleNode {
+      get {
+        var node = FirstVisibleNode;
+        while (node.NextVisibleNode != null) node = node.NextVisibleNode;
+        return node;
       }
     }