tmf.ui: make XY charts drag the canvas when CTRL-leftclicked

This is more inline with the timegraph view.

Change-Id: Iba8bb83a345be99cd40c7b5e1fdbd300998966c4
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/75103
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-by: Hudson CI

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragProvider.java
index ca624fbe443cdc2d6c5650a8eed424d6b2d0b350..31ab12a42e8eaa608c15ce684522fef6a512b2f1 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragProvider.java
@@ -11,6 +11,7 @@
  **********************************************************************/
 package org.eclipse.tracecompass.tmf.ui.viewers.xycharts;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.events.MouseMoveListener;
@@ -82,7 +83,7 @@ public class TmfMouseDragProvider extends TmfBaseProvider implements MouseListen
 
     @Override
     public void mouseDown(MouseEvent e) {
-        if ((getChartViewer().getWindowDuration() != 0) && (e.button == 2)) {
+        if ((getChartViewer().getWindowDuration() != 0) && ((e.button == 2) || (e.button == 1 && (e.stateMask & SWT.CTRL) != 0))) {
             fStartPosition = e.x;
             fIsUpdate = true;
         }

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseSelectionProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseSelectionProvider.java
index 65f0788e9af0d049ad8a90e6d473595b91e16730..fdb54fc52a8e430c73e37db5ff5a09f364b12c46 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseSelectionProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseSelectionProvider.java
@@ -21,8 +21,8 @@ import org.swtchart.ICustomPaintListener;
 import org.swtchart.IPlotArea;
 
 /**
- * Class for providing selection of ranges with the left mouse button.
- * It also notifies the viewer about a change of selection.
+ * Class for providing selection of ranges with the left mouse button. It also
+ * notifies the viewer about a change of selection.
  *
  * @author Bernd Hufmann
  */
@@ -47,7 +47,7 @@ public class TmfMouseSelectionProvider extends TmfBaseProvider implements MouseL
      * Default constructor
      *
      * @param tmfChartViewer
-     *          The chart viewer reference.
+     *            The chart viewer reference.
      */
     public TmfMouseSelectionProvider(ITmfChartTimeProvider tmfChartViewer) {
         super(tmfChartViewer);
@@ -83,6 +83,9 @@ public class TmfMouseSelectionProvider extends TmfBaseProvider implements MouseL
     @Override
     public void mouseDown(MouseEvent e) {
         if ((getChartViewer().getWindowDuration() != 0) && (e.button == 1)) {
+            if ((e.stateMask & SWT.CTRL) != 0) {
+                return;
+            }
             fDragBeginMarker = false;
             if ((e.stateMask & SWT.SHIFT) != SWT.SHIFT) {
                 IAxis xAxis = getChart().getAxisSet().getXAxis(0);