tmf: Set redraw false also for when refreshing the CFV

This avoids a flickering in Windows.

Change-Id: I28732f4a11e87a6e25b77e9cc7c056b5e991c2c6
Signed-off-by: Bernd Hufmann <Bernd.Hufmann@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/66337
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/views/timegraph/AbstractTimeGraphView.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java
index 9d50149b569241211f4391cccc0e25e5bd976c62..682487763e6cebe8a56dc09523c4e6e5f9ff0e1a 100644 (file)
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/views/timegraph/AbstractTimeGraphView.java
@@ -1698,14 +1698,14 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA
                     hasEntries = !fEntryList.isEmpty();
                 }
                 boolean inputChanged = fEntryList != fTimeGraphWrapper.getInput();
-                if (inputChanged) {
-                    TimeGraphCombo combo = getTimeGraphCombo();
-                    try {
-                        // Set redraw to false to only draw once
-                        if (combo != null) {
-                            combo.getTreeViewer().getTree().setRedraw(false);
-                        }
-                        getTimeGraphViewer().getTimeGraphControl().setRedraw(false);
+                TimeGraphCombo combo = getTimeGraphCombo();
+                try {
+                    // Set redraw to false to only draw once
+                    if (combo != null) {
+                        combo.getTreeViewer().getTree().setRedraw(false);
+                    }
+                    getTimeGraphViewer().getTimeGraphControl().setRedraw(false);
+                    if (inputChanged) {
                         fTimeGraphWrapper.setInput(fEntryList);
                         /* restore the previously saved filters, if any */
                         fTimeGraphWrapper.setFilters(fFiltersMap.get(fTrace));
@@ -1714,14 +1714,20 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA
                         fTimeGraphWrapper.getTimeGraphViewer().setMarkerCategories(getMarkerCategories());
                         fTimeGraphWrapper.getTimeGraphViewer().setMarkers(null);
                         applyViewContext();
-                    } finally {
-                        if (combo != null) {
-                            combo.getTreeViewer().getTree().setRedraw(true);
-                        }
-                        getTimeGraphViewer().getTimeGraphControl().setRedraw(true);
+                    } else {
+                        fTimeGraphWrapper.refresh();
                     }
-                } else {
-                    fTimeGraphWrapper.refresh();
+                    // reveal selection
+                    if (fIsRevealSelection) {
+                        fIsRevealSelection = false;
+                        ITimeGraphEntry entry1 = fTimeGraphWrapper.getSelection();
+                        fTimeGraphWrapper.setSelection(entry1);
+                    }
+                } finally {
+                    if (combo != null) {
+                        combo.getTreeViewer().getTree().setRedraw(true);
+                    }
+                    getTimeGraphViewer().getTimeGraphControl().setRedraw(true);
                 }
                 long startBound = (fStartTime == Long.MAX_VALUE ? SWT.DEFAULT : fStartTime);
                 long endBound = (fEndTime == Long.MIN_VALUE ? SWT.DEFAULT : fEndTime);
@@ -1750,13 +1756,6 @@ public abstract class AbstractTimeGraphView extends TmfView implements ITmfTimeA
                     }
                 }
 
-                // reveal selection
-                if (fIsRevealSelection) {
-                    fIsRevealSelection = false;
-                    ITimeGraphEntry entry1 = fTimeGraphWrapper.getSelection();
-                    fTimeGraphWrapper.setSelection(entry1);
-                }
-
                 if (!zoomThread) {
                     startZoomThread(startTime, endTime);
                 }