Changeset 15280 for branches/Async/HeuristicLab.Data.Views/3.3

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.Data.Views (modified) (1 prop)
• HeuristicLab.Data.Views/3.3 (modified) (1 prop)
• HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs (modified) (2 diffs)
• HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs (modified) (2 diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (2 diffs)
• HeuristicLab.Data.Views/3.3/StringConvertibleValueView.Designer.cs (modified) (1 diff)

branches/Async/HeuristicLab.Data.Views/3.3/EnhancedStringConvertibleMatrixView.cs

@@ -69 +69 @@
     }
 
-    protected override void UpdateColumnHeaders() {
+    public override void UpdateColumnHeaders() {
       base.UpdateColumnHeaders();
       if (columnVisibility != null && Content != null && columnVisibility.Count() == dataGridView.ColumnCount) {
@@ -79 +79 @@
       }
     }
-    protected override void UpdateRowHeaders() {
+    public override void UpdateRowHeaders() {
       if (Content == null) return;
       if (rowVisibility != null && rowVisibility.Count() != dataGridView.RowCount) return;

branches/Async/HeuristicLab.Data.Views/3.3/HeuristicLab.Data.Views-3.3.csproj

@@ -189 +189 @@
       <DependentUpon>BoolValueView.cs</DependentUpon>
     </Compile>
-   <Compile Include="BoolMatrixView.cs">
+    <Compile Include="BoolMatrixView.cs">
       <SubType>UserControl</SubType>
     </Compile>

branches/Async/HeuristicLab.Data.Views/3.3/StringConvertibleArrayView.cs

@@ -80 +80 @@
       lengthTextBox.Enabled = Content != null;
       dataGridView.Enabled = Content != null;
-      lengthTextBox.ReadOnly = ReadOnly;
+      lengthTextBox.ReadOnly = ReadOnly || (Content != null && !Content.Resizable);
       dataGridView.ReadOnly = ReadOnly;
     }
@@ -103 +103 @@
     }
 
-    protected virtual void UpdateRowHeaders() {
+    public virtual void UpdateRowHeaders() {
       int i = 0;
       foreach (string elementName in Content.ElementNames) {

branches/Async/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -160 +160 @@
     }
 
-    protected virtual void UpdateColumnHeaders() {
+    public virtual void UpdateColumnHeaders() {
       HashSet<string> invisibleColumnNames = new HashSet<string>(dataGridView.Columns.OfType<DataGridViewColumn>()
       .Where(c => !c.Visible && !string.IsNullOrEmpty(c.HeaderText)).Select(c => c.HeaderText));
@@ -172 +172 @@
       }
     }
-    protected virtual void UpdateRowHeaders() {
+    public virtual void UpdateRowHeaders() {
       int index = dataGridView.FirstDisplayedScrollingRowIndex;
       if (index == -1) index = 0;

branches/Async/HeuristicLab.Data.Views/3.3/StringConvertibleValueView.Designer.cs

@@ -63 +63 @@
       this.valueTextBox.Location = new System.Drawing.Point(17, 0);
       this.valueTextBox.Name = "valueTextBox";
-      this.valueTextBox.Size = new System.Drawing.Size(135, 20);
+      this.valueTextBox.Size = new System.Drawing.Size(132, 20);
       this.valueTextBox.TabIndex = 2;
       this.valueTextBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.valueTextBox_KeyDown);