Changeset 17124

Timestamp:

07/11/19 00:22:56 (5 years ago)

Author:

swagner

Message:

#2949: Merged r17007, r17008, r17118 from trunk into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemArrayView.cs (modified) (4 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs (modified) (2 diffs)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (5 diffs)
• HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs (modified) (1 diff)
• HeuristicLab.Core.Views/3.3/ItemListView.cs (modified) (4 diffs)

stable/HeuristicLab.Core.Views/3.3/ItemArrayView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Security.AccessControl;
 using System.Windows.Forms;
 
@@ -154 +153 @@
       this.itemsListView.DoubleClick += new System.EventHandler(this.itemsListView_DoubleClick);
       this.itemsListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.itemsListView_KeyDown);
+      this.itemsListView.Layout += new System.Windows.Forms.LayoutEventHandler(this.itemsListView_Layout);
+      //
+      // listViewColumnHeader
+      //
+      this.listViewColumnHeader.Width = 190;
       // 
       // imageList

stable/HeuristicLab.Core.Views/3.3/ItemArrayView.cs

@@ -237 +237 @@
                                (Content != null) && !Content.IsReadOnly && !ReadOnly;
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 && (Content != null) && !Content.IsReadOnly && !ReadOnly;
-      AdjustListViewColumnSizes();
 
       if (showDetailsCheckBox.Checked) {
@@ -330 +329 @@
       }
     }
+    protected virtual void itemsListView_Layout(object sender, LayoutEventArgs e) {
+      if (itemsListView.Columns.Count == 1)
+        AdjustListViewColumnSizes();
+    }
     #endregion
 
@@ -453 +456 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
-        AdjustListViewColumnSizes();
+        if (itemsListView.Columns.Count > 1)
+          AdjustListViewColumnSizes();
       }
     }
@@ -460 +464 @@
     #region Helpers
     protected virtual void AdjustListViewColumnSizes() {
-      if (itemsListView.Items.Count > 0) {
-        for (int i = 0; i < itemsListView.Columns.Count; i++)
-          itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+      if (itemsListView.Columns.Count == 1) {
+        if (itemsListView.Columns[0].Width != itemsListView.ClientSize.Width)
+          itemsListView.Columns[0].Width = itemsListView.ClientSize.Width;
+      } else {
+        if (itemsListView.Items.Count > 0) {
+          for (int i = 0; i < itemsListView.Columns.Count; i++)
+            itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
       }
     }

stable/HeuristicLab.Core.Views/3.3/ItemCollectionView.Designer.cs

@@ -20 +20 @@
 #endregion
 
-using System.Security.AccessControl;
 using System.Windows.Forms;
 
@@ -107 +106 @@
       this.itemsListView.DoubleClick += new System.EventHandler(this.itemsListView_DoubleClick);
       this.itemsListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.itemsListView_KeyDown);
+      this.itemsListView.Layout += new System.Windows.Forms.LayoutEventHandler(this.itemsListView_Layout);
+      // 
+      // columnHeader1
+      // 
+      this.columnHeader1.Width = 240;
       // 
       // imageList

stable/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -104 +104 @@
       if (Content != null) {
         Caption += " (" + Content.GetType().Name + ")";
-        foreach (T item in Content)
+        foreach (T item in Content.OrderBy(x => x.ToString()))
           AddListViewItem(CreateListViewItem(item));
         AdjustListViewColumnSizes();
-        SortItemsListView(SortOrder.Ascending);
       }
     }
@@ -221 +220 @@
     protected virtual void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
       removeButton.Enabled = (Content != null) && !Content.IsReadOnly && !ReadOnly && itemsListView.SelectedItems.Count > 0;
-      AdjustListViewColumnSizes();
       if (showDetailsCheckBox.Checked) {
         if (itemsListView.SelectedItems.Count == 1) {
@@ -327 +325 @@
       }
     }
+    protected virtual void itemsListView_Layout(object sender, LayoutEventArgs e) {
+      if (itemsListView.Columns.Count == 1)
+        AdjustListViewColumnSizes();
+    }
     #endregion
 
@@ -423 +425 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
-        AdjustListViewColumnSizes();
+        if (itemsListView.Columns.Count > 1)
+          AdjustListViewColumnSizes();
       }
     }
@@ -435 +438 @@
     }
     protected virtual void AdjustListViewColumnSizes() {
-      if (itemsListView.Items.Count > 0) {
-        for (int i = 0; i < itemsListView.Columns.Count; i++)
-          itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+      if (itemsListView.Columns.Count == 1) {
+        if (itemsListView.Columns[0].Width != itemsListView.ClientSize.Width)
+          itemsListView.Columns[0].Width = itemsListView.ClientSize.Width;
+      } else {
+        if (itemsListView.Items.Count > 0) {
+          for (int i = 0; i < itemsListView.Columns.Count; i++)
+            itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
       }
     }

stable/HeuristicLab.Core.Views/3.3/ItemListView.Designer.cs

@@ -155 +155 @@
       this.itemsListView.DoubleClick += new System.EventHandler(this.itemsListView_DoubleClick);
       this.itemsListView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.itemsListView_KeyDown);
+      this.itemsListView.Layout += new System.Windows.Forms.LayoutEventHandler(this.itemsListView_Layout);
+      // 
+      // listViewColumnHeader
+      // 
+      this.listViewColumnHeader.Width = 190;
       // 
       // imageList

stable/HeuristicLab.Core.Views/3.3/ItemListView.cs

@@ -242 +242 @@
       removeButton.Enabled = itemsListView.SelectedItems.Count > 0 &&
                              (Content != null) && !Content.IsReadOnly && !ReadOnly;
-      AdjustListViewColumnSizes();
-
+      
       if (showDetailsCheckBox.Checked) {
         if (itemsListView.SelectedItems.Count == 1) {
@@ -354 +353 @@
       }
     }
+    protected virtual void itemsListView_Layout(object sender, LayoutEventArgs e) {
+      if (itemsListView.Columns.Count == 1)
+        AdjustListViewColumnSizes();
+    }
     #endregion
 
@@ -494 +497 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
-        AdjustListViewColumnSizes();
+        if (itemsListView.Columns.Count > 1)
+          AdjustListViewColumnSizes();
       }
     }
@@ -501 +505 @@
     #region Helpers
     protected virtual void AdjustListViewColumnSizes() {
-      if (itemsListView.Items.Count > 0) {
-        for (int i = 0; i < itemsListView.Columns.Count; i++)
-          itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+      if (itemsListView.Columns.Count == 1) {
+        if (itemsListView.Columns[0].Width != itemsListView.ClientSize.Width)
+          itemsListView.Columns[0].Width = itemsListView.ClientSize.Width;
+      } else {
+        if (itemsListView.Items.Count > 0) {
+          for (int i = 0; i < itemsListView.Columns.Count; i++)
+            itemsListView.Columns[i].AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
       }
     }