tmf: Add time graph marker axis for marker labels

[deliverable/tracecompass.git] / tmf / org.eclipse.tracecompass.tmf.ui / src / org / eclipse / tracecompass / tmf / ui / widgets / timegraph / widgets / TimeGraphControl.java

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
index 322eeb2d05a3e651ba08dfd8fde67c08c17afc91..114ee0271f94bda182338e4d5306203e8b5c8fc3 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/widgets/TimeGraphControl.java
@@ -1082,7 +1082,6 @@ public class TimeGraphControl extends TimeGraphBaseControl
      */
     public void setMarkers(List<IMarkerEvent> markers) {
         fMarkers = markers;
-        fTimeGraphScale.setMarkers(markers);
     }
 
     /**
@@ -1104,7 +1103,6 @@ public class TimeGraphControl extends TimeGraphBaseControl
      */
     public void setMarkersVisible(boolean visible) {
         fMarkersVisible = visible;
-        fTimeGraphScale.setMarkersVisible(visible);
     }
 
     /**
@@ -2718,12 +2716,8 @@ public class TimeGraphControl extends TimeGraphBaseControl
                 // over the time scale
                 horizontalZoom = true;
             } else if (e.y >= getSize().y) {
-                // over the horizontal scroll bar
-                if ((e.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL) {
-                    horizontalZoom = true;
-                } else {
-                    horizontalScroll = true;
-                }
+                // over the marker axis
+                horizontalZoom = true;
             } else {
                 if ((e.stateMask & SWT.MODIFIER_MASK) == (SWT.SHIFT | SWT.CTRL)) {
                     verticalZoom = true;