Changeset 5891


Ignore:
Timestamp:
03/30/11 15:38:24 (11 years ago)
Author:
mkommend
Message:

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

Location:
trunk/sources/HeuristicLab.Data.Views/3.3
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Data.Views/3.3/DoubleRangeView.Designer.cs

    r5809 r5891  
    4646      this.SuspendLayout();
    4747      //
     48      // Item1View
     49      //
     50      this.Item1View.Location = new System.Drawing.Point(41, 3);
     51      this.Item1View.Size = new System.Drawing.Size(264, 22);
     52      //
     53      // Item2View
     54      //
     55      this.Item2View.Location = new System.Drawing.Point(41, 31);
     56      this.Item2View.Size = new System.Drawing.Size(264, 22);
     57      //
    4858      // Item1Label
    4959      //
  • trunk/sources/HeuristicLab.Data.Views/3.3/IntRangeView.Designer.cs

    r5809 r5891  
    4646      this.SuspendLayout();
    4747      //
     48      // Item1View
     49      //
     50      this.Item1View.Location = new System.Drawing.Point(41, 3);
     51      this.Item1View.Size = new System.Drawing.Size(264, 22);
     52      //
     53      // Item2View
     54      //
     55      this.Item2View.Location = new System.Drawing.Point(41, 31);
     56      this.Item2View.Size = new System.Drawing.Size(264, 22);
     57      //
    4858      // Item1Label
    4959      //
     
    6272      this.ResumeLayout(false);
    6373      this.PerformLayout();
     74
    6475    }
    6576
  • trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueTupleView.Designer.cs

    r5809 r5891  
    9494      this.Item2Label.Text = "Item2:";
    9595      //
    96       // ValueTypeTupleView
     96      // StringConvertibleValueTupleView
    9797      //
    9898      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    9999      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     100      this.Controls.Add(this.Item1Label);
    100101      this.Controls.Add(this.Item2Label);
    101       this.Controls.Add(this.Item1Label);
     102      this.Controls.Add(this.Item1View);
    102103      this.Controls.Add(this.Item2View);
    103       this.Controls.Add(this.Item1View);
    104       this.Name = "ValueTypeTupleView";
     104      this.Name = "StringConvertibleValueTupleView";
    105105      this.Size = new System.Drawing.Size(308, 56);
    106106      this.ResumeLayout(false);
    107107      this.PerformLayout();
    108 
    109108    }
    110109
  • trunk/sources/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.cs

    r5445 r5891  
    2222using System;
    2323using System.ComponentModel;
     24using System.Drawing;
    2425using System.Windows.Forms;
    2526using HeuristicLab.MainForm;
     
    8788    private void valueTextBox_KeyDown(object sender, KeyEventArgs e) {
    8889      if ((e.KeyCode == Keys.Enter) || (e.KeyCode == Keys.Return))
    89         valueLabel.Focus();  // set focus on label to validate data
     90        valueLabel.Select();  // select label to validate data
     91
    9092      if (e.KeyCode == Keys.Escape) {
    9193        valueTextBox.Text = Content.GetValue();
    92         valueLabel.Focus();  // set focus on label to validate data
     94        valueLabel.Select();  // select label to validate data
    9395      }
    9496    }
     
    108110
    109111    private void valueLabel_VisibleChanged(object sender, EventArgs e) {
    110       if (valueLabel.Visible)
    111         valueTextBox.Dock = DockStyle.None;
    112       else
    113         valueTextBox.Dock = DockStyle.Fill;
     112      if (valueLabel.Visible) {
     113        valueTextBox.Location = new Point(56, 0);
     114        valueTextBox.Size = new Size(valueTextBox.Size.Width - valueLabel.Size.Width, valueTextBox.Size.Height);
     115      } else {
     116        valueTextBox.Location = new Point(19, 0);
     117        valueTextBox.Size = new Size(valueTextBox.Size.Width + valueLabel.Size.Width, valueTextBox.Size.Height);
     118      }
    114119    }
    115120
Note: See TracChangeset for help on using the changeset viewer.