Changeset 5891

Timestamp:

03/30/11 15:38:24 (14 years ago)

Author:

mkommend

Message:

#1460: Corrected StringConvertibleValueView and adapted StringConvertibleValueTupleView and derived views.

Location:

trunk/sources/HeuristicLab.Data.Views/3.3

Files:

• DoubleRangeView.Designer.cs (modified) (1 diff)
• IntRangeView.Designer.cs (modified) (2 diffs)
• StringConvertibleValueTupleView.Designer.cs (modified) (1 diff)
• StringConvertibleValueView.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Data.Views/3.3/DoubleRangeView.Designer.cs

@@ -46 +46 @@
       this.SuspendLayout();
       // 
+      // Item1View
+      // 
+      this.Item1View.Location = new System.Drawing.Point(41, 3);
+      this.Item1View.Size = new System.Drawing.Size(264, 22);
+      // 
+      // Item2View
+      // 
+      this.Item2View.Location = new System.Drawing.Point(41, 31);
+      this.Item2View.Size = new System.Drawing.Size(264, 22);
+      // 
       // Item1Label
       // 

trunk/sources/HeuristicLab.Data.Views/3.3/IntRangeView.Designer.cs

@@ -46 +46 @@
       this.SuspendLayout();
       // 
+      // Item1View
+      // 
+      this.Item1View.Location = new System.Drawing.Point(41, 3);
+      this.Item1View.Size = new System.Drawing.Size(264, 22);
+      // 
+      // Item2View
+      // 
+      this.Item2View.Location = new System.Drawing.Point(41, 31);
+      this.Item2View.Size = new System.Drawing.Size(264, 22);
+      // 
       // Item1Label
       // 
@@ -62 +72 @@
       this.ResumeLayout(false);
       this.PerformLayout();
+
     }
 

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueTupleView.Designer.cs

@@ -94 +94 @@
       this.Item2Label.Text = "Item2:";
       // 
-      // ValueTypeTupleView
+      // StringConvertibleValueTupleView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.Item1Label);
       this.Controls.Add(this.Item2Label);
-      this.Controls.Add(this.Item1Label);
+      this.Controls.Add(this.Item1View);
       this.Controls.Add(this.Item2View);
-      this.Controls.Add(this.Item1View);
-      this.Name = "ValueTypeTupleView";
+      this.Name = "StringConvertibleValueTupleView";
       this.Size = new System.Drawing.Size(308, 56);
       this.ResumeLayout(false);
       this.PerformLayout();
-
     }
 

trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs

@@ -22 +22 @@
 using System;
 using System.ComponentModel;
+using System.Drawing;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -87 +88 @@
     private void valueTextBox_KeyDown(object sender, KeyEventArgs e) {
       if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return))
-        valueLabel.Focus();  // set focus on label to validate data
+        valueLabel.Select();  // select label to validate data
+
       if (e.KeyCode == Keys.Escape) {
         valueTextBox.Text = Content.GetValue();
-        valueLabel.Focus();  // set focus on label to validate data
+        valueLabel.Select();  // select label to validate data
       }
     }
@@ -108 +110 @@
 
     private void valueLabel_VisibleChanged(object sender, EventArgs e) {
-      if (valueLabel.Visible)
-        valueTextBox.Dock = DockStyle.None;
-      else
-        valueTextBox.Dock = DockStyle.Fill;
+      if (valueLabel.Visible) {
+        valueTextBox.Location = new Point(56, 0);
+        valueTextBox.Size = new Size(valueTextBox.Size.Width - valueLabel.Size.Width, valueTextBox.Size.Height);
+      } else {
+        valueTextBox.Location = new Point(19, 0);
+        valueTextBox.Size = new Size(valueTextBox.Size.Width + valueLabel.Size.Width, valueTextBox.Size.Height);
+      }
     }