Changeset 12167 for branches/DataPreprocessingImprovements

Timestamp:

03/09/15 16:00:26 (10 years ago)

Author:

ehopf

Message:

#2335: Swapped column left- and rightclick behavior in the DataGrid view, to be consistent with the row selection behavior.

File:

• branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (3 diffs)

branches/DataPreprocessingImprovements/HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs

@@ -61 +61 @@
       dataGridView.KeyDown += dataGridView_KeyDown;
       dataGridView.MouseUp += dataGridView_MouseUp;
-      dataGridView.ColumnHeaderMouseClick += dataGridView_ColumnHeaderMouseClick;
       contextMenuCell.Items.Add(ShowHideColumns);
       _highlightedCellsBackground = new Dictionary<int, IList<int>>();
@@ -164 +163 @@
     }
 
-    private void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
+    protected override void dataGridView_ColumnHeaderMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
+      if (Content != null) {
+        if (e.Button == System.Windows.Forms.MouseButtons.Left) {
+          dataGridView.Focus();
+          dataGridView.ClearSelection();
+          dataGridView.SelectionChanged -= dataGridView_SelectionChanged;
+          for (int i = 0; i < dataGridView.RowCount; i++) {
+            if (i + 1 == dataGridView.RowCount)
+              dataGridView.SelectionChanged += dataGridView_SelectionChanged;
+            dataGridView[e.ColumnIndex, i].Selected = true;
+          }
+        } else if (Content.SortableView) {
+          SortColumn(e.ColumnIndex);
+        }
+      }
       searchIterator = null;
     }
@@ -437 +450 @@
     private void dataGridView_CellMouseClick(object sender, DataGridViewCellMouseEventArgs e) {
       if (Content == null) return;
-      if (e.Button == System.Windows.Forms.MouseButtons.Right) {
-        if (e.ColumnIndex != -1 && e.RowIndex == -1) {
-          dataGridView.Focus();
-          dataGridView.ClearSelection();
-          for (int r = 0; r < dataGridView.RowCount; r++) {
-            dataGridView[e.ColumnIndex, r].Selected = true;
-          }
-          return;
-        }
+      if (e.Button == System.Windows.Forms.MouseButtons.Right && !(e.ColumnIndex != -1 && e.RowIndex == -1)) {
         if (e.ColumnIndex == -1 || e.RowIndex == -1) {
           replaceValueOverColumnToolStripMenuItem.Visible = false;