Changeset 17120 for branches/2994-AutoDiffForIntervals/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

Timestamp:

07/10/19 17:39:38 (5 years ago)

Author:

gkronber

Message:

#2994: merged r17007:17118 from trunk to branch

Location:

branches/2994-AutoDiffForIntervals

Files:

• . (modified) (1 prop)
• HeuristicLab.Core.Views (modified) (1 prop)
• HeuristicLab.Core.Views/3.3/ItemCollectionView.cs (modified) (5 diffs)

branches/2994-AutoDiffForIntervals/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);
+        }
       }
     }