Changeset 17226 for branches/2521_ProblemRefactoring/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

Timestamp:

08/29/19 15:57:35 (5 years ago)

Author:

mkommend

Message:

#2521: Merged trunk changes into problem refactoring branch.

Location:

branches/2521_ProblemRefactoring

Files:

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

branches/2521_ProblemRefactoring/HeuristicLab.Core.Views/3.3/ItemCollectionView.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2019 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -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) {
@@ -250 +248 @@
           Clipboard.SetText(builder.ToString());
         }
+      } else if (itemsListView.MultiSelect && e.KeyData == (Keys.A | Keys.Control)) {
+        try {
+          itemsListView.BeginUpdate();
+          foreach (ListViewItem item in itemsListView.Items)
+            item.Selected = true;
+        } finally { itemsListView.EndUpdate(); }
       }
     }
@@ -327 +331 @@
       }
     }
+    protected virtual void itemsListView_Layout(object sender, LayoutEventArgs e) {
+      if (itemsListView.Columns.Count == 1)
+        AdjustListViewColumnSizes();
+    }
     #endregion
 
@@ -423 +431 @@
         foreach (ListViewItem listViewItem in GetListViewItemsForItem(item))
           UpdateListViewItemText(listViewItem);
-        AdjustListViewColumnSizes();
+        if (itemsListView.Columns.Count > 1)
+          AdjustListViewColumnSizes();
       }
     }
@@ -435 +444 @@
     }
     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);
+        }
       }
     }