tmf: Bug 488806: Mouse scroll with count of zero not handled correctly

Change-Id: I11e9b5261b687b0095e29e2f7cb35a3507a18591
Signed-off-by: Patrick Tasse <patrick.tasse@gmail.com>
Reviewed-on: https://git.eclipse.org/r/67639
Reviewed-by: Hudson CI
Reviewed-by: Bernd Hufmann <bernd.hufmann@ericsson.com>
Tested-by: Bernd Hufmann <bernd.hufmann@ericsson.com>

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseWheelZoomProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseWheelZoomProvider.java
index 071aee5783372c202c206857a3ac2839eaf1ecd0..2c7a63acba76c47a6baf45a7f7840eb3041327de 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseWheelZoomProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseWheelZoomProvider.java
@@ -73,7 +73,7 @@ public class TmfMouseWheelZoomProvider extends TmfBaseProvider implements MouseW
 
         long oldDuration = viewer.getWindowDuration();
 
-        if (oldDuration == 0) {
+        if (oldDuration == 0 || event.count == 0) {
             return;
         }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramZoom.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramZoom.java
index 8b852efed61667c2347749ae1df9119069732690..374c4ccc3423ee4fdcb9fdae21b70e7981c70325 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramZoom.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/histogram/HistogramZoom.java
@@ -149,6 +149,9 @@ public class HistogramZoom implements MouseWheelListener, KeyListener {
 
     @Override
     public void mouseScrolled(MouseEvent event) {
+        if (event.count == 0) {
+            return;
+        }
         zoom(event.count);
     }
 

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
index 66952f6ede531c02417dfcb0116b5c39bc162fab..397fc78e5344e62557d8a139147226390ac345eb 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/rawviewer/TmfRawEventViewer.java
@@ -1173,7 +1173,7 @@ public class TmfRawEventViewer extends Composite implements ControlListener, Sel
 
     @Override
     public void mouseScrolled(MouseEvent e) {
-        if (fLines.size() == 0) {
+        if (fLines.size() == 0 || e.count == 0) {
             return;
         }
         fHoldSelection++;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
index 4e802e89dd7ecca060d738104e2640f8182f5c72..646d8e9af876aa0fb3197d4c2097a1b052c93e04 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
@@ -636,6 +636,9 @@ public class TimeGraphCombo extends Composite {
             @Override
             public void handleEvent(Event event) {
                 event.doit = false;
+                if (event.count == 0) {
+                    return;
+                }
                 Slider scrollBar = fTimeGraphViewer.getVerticalBar();
                 fTimeGraphViewer.setTopIndex(scrollBar.getSelection() - event.count);
                 alignTreeItems(false);
@@ -740,6 +743,9 @@ public class TimeGraphCombo extends Composite {
         fTimeGraphViewer.getTimeGraphControl().addMouseWheelListener(new MouseWheelListener() {
             @Override
             public void mouseScrolled(MouseEvent e) {
+                if (e.count == 0) {
+                    return;
+                }
                 alignTreeItems(false);
             }
         });

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
index b32af2d44c372bb60c13ca74000e916366b1d8e1..76de9c8963aee9f21c358b2260052b31c84bf607 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
@@ -502,6 +502,9 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fTimeScaleCtrl.addMouseWheelListener(new MouseWheelListener() {
             @Override
             public void mouseScrolled(MouseEvent e) {
+                if (e.count == 0) {
+                    return;
+                }
                 fTimeGraphCtrl.zoom(e.count > 0);
             }
         });
@@ -515,6 +518,9 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fTimeGraphCtrl.addMouseWheelListener(new MouseWheelListener() {
             @Override
             public void mouseScrolled(MouseEvent e) {
+                if (e.count == 0) {
+                    return;
+                }
                 adjustVerticalScrollBar();
             }
         });
@@ -550,6 +556,9 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fMarkerAxisCtrl.addMouseWheelListener(new MouseWheelListener() {
             @Override
             public void mouseScrolled(MouseEvent e) {
+                if (e.count == 0) {
+                    return;
+                }
                 fTimeGraphCtrl.zoom(e.count > 0);
             }
         });
@@ -568,13 +577,16 @@ public class TimeGraphViewer implements ITimeDataProvider, IMarkerAxisListener,
         fHorizontalScrollBar.addListener(SWT.MouseWheel, new Listener() {
             @Override
             public void handleEvent(Event event) {
+                // don't handle the immediately following SWT.Selection event
+                event.doit = false;
+                if (event.count == 0) {
+                    return;
+                }
                 if ((event.stateMask & SWT.MODIFIER_MASK) == SWT.CTRL) {
                     getTimeGraphControl().zoom(event.count > 0);
                 } else {
                     getTimeGraphControl().horizontalScroll(event.count > 0);
                 }
-                // don't handle the immediately following SWT.Selection event
-                event.doit = false;
             }
         });
         fHorizontalScrollBar.addListener(SWT.Selection, new Listener() {

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 114ee0271f94bda182338e4d5306203e8b5c8fc3..e02e3058ff37fcee25ca1fd11018994e999d7b10 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
@@ -2697,7 +2697,7 @@ public class TimeGraphControl extends TimeGraphBaseControl
 
     @Override
     public void mouseScrolled(MouseEvent e) {
-        if (fDragState != DRAG_NONE) {
+        if (fDragState != DRAG_NONE || e.count == 0) {
             return;
         }
         boolean horizontalZoom = false;

diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/virtualtable/TmfVirtualTable.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/virtualtable/TmfVirtualTable.java
index c1abdb5f4fdb671fb4193cdf8e90ee6f36b91eef..655fdbf84c73cd3fdecc7265117d7587ca2907b3 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/virtualtable/TmfVirtualTable.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/virtualtable/TmfVirtualTable.java
@@ -169,7 +169,7 @@ public class TmfVirtualTable extends Composite {
         fTable.addMouseWheelListener(new MouseWheelListener() {
             @Override
             public void mouseScrolled(MouseEvent event) {
-                if (fTableItemCount <= fFullyVisibleRows) {
+                if (fTableItemCount <= fFullyVisibleRows || event.count == 0) {
                     return;
                 }
                 fTableTopEventRank -= event.count;