Changeset 12202 for branches/NewItemDialog/HeuristicLab.Optimizer

Timestamp:

03/16/15 12:03:52 (10 years ago)

Author:

pfleck

Message:

#2025 Changed tab indices and focus behavior on first show.

Location:

branches/NewItemDialog/HeuristicLab.Optimizer/3.3

Files:

• NewItemDialog.Designer.cs (modified) (4 diffs)
• NewItemDialog.cs (modified) (4 diffs)

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

@@ -127 +127 @@
       this.expandAllButton.Name = "expandAllButton";
       this.expandAllButton.Size = new System.Drawing.Size(23, 23);
-      this.expandAllButton.TabIndex = 4;
+      this.expandAllButton.TabIndex = 1;
       this.expandAllButton.UseVisualStyleBackColor = true;
       this.expandAllButton.Click += new System.EventHandler(this.expandAllButton_Click);
@@ -137 +137 @@
       this.collapseAllButton.Name = "collapseAllButton";
       this.collapseAllButton.Size = new System.Drawing.Size(23, 23);
-      this.collapseAllButton.TabIndex = 5;
+      this.collapseAllButton.TabIndex = 2;
       this.collapseAllButton.UseVisualStyleBackColor = true;
       this.collapseAllButton.Click += new System.EventHandler(this.collapseAllButton_Click);
@@ -148 +148 @@
       this.searchTextBox.Name = "searchTextBox";
       this.searchTextBox.Size = new System.Drawing.Size(514, 20);
-      this.searchTextBox.TabIndex = 1;
+      this.searchTextBox.TabIndex = 3;
       this.searchTextBox.TextChanged += new System.EventHandler(this.searchTextBox_TextChanged);
       // 
@@ -164 +164 @@
       this.typesTreeView.ShowNodeToolTips = true;
       this.typesTreeView.Size = new System.Drawing.Size(594, 260);
-      this.typesTreeView.TabIndex = 2;
+      this.typesTreeView.TabIndex = 4;
       this.typesTreeView.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.itemsTreeView_AfterSelect);
       this.typesTreeView.VisibleChanged += new System.EventHandler(this.itemsTreeView_VisibleChanged);

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

@@ -30 +30 @@
   internal partial class NewItemDialog : Form {
     private bool isInitialized;
+    private bool firstShown = true;
 
     private List<TreeNode> treeNodes;
@@ -58 +59 @@
     }
 
-
     private void NewItemDialog_Load(object sender, EventArgs e) {
       if (isInitialized) return;
@@ -111 +111 @@
       isInitialized = true;
     }
-
     private void NewItemDialog_Shown(object sender, EventArgs e) {
       SelectedType = null;
+      if (firstShown) {
+        searchTextBox.Focus();
+        firstShown = false;
+      }
     }
 
@@ -230 +233 @@
     }
     private void SetTreeNodeVisibility() {
+      typesTreeView.ExpandAll();
       TreeNode selectedNode = typesTreeView.SelectedNode;
-      if (string.IsNullOrEmpty(currentSearchString) && (typesTreeView.Nodes.Count > 1)) {
-        typesTreeView.CollapseAll();
-        if (selectedNode != null) typesTreeView.SelectedNode = selectedNode;
-      } else {
-        typesTreeView.ExpandAll();
-      }
-      if (selectedNode != null) selectedNode.EnsureVisible();
+      if (selectedNode != null) {
+        typesTreeView.SelectedNode = selectedNode;
+        selectedNode.EnsureVisible();
+      } else if (string.IsNullOrEmpty(currentSearchString) && typesTreeView.Nodes.Count > 1) {
+        typesTreeView.Nodes[0].EnsureVisible();
+      }
     }
     #endregion