tmf: Fix bad width value when timegraph views are smaller than time axis offset

Change-Id: I2e2a4361e0ce1fb1857e4f0be7e781c56ead438c
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/47485
Reviewed-by: Hudson CI

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
index 7a4907cf1b560a4fa644e4c34a6e5b4889b2804c..fa813bd3ed4fa813782edc762153d5754fc69c35 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphCombo.java
@@ -1203,8 +1203,7 @@ public class TimeGraphCombo extends Composite {
      */
     public int getAvailableWidth(int requestedOffset) {
         int totalWidth = fSashForm.getBounds().width;
-        int timeWidth = totalWidth - requestedOffset;
-        return timeWidth;
+        return Math.min(totalWidth, Math.max(0, totalWidth - requestedOffset));
     }
 
     /**

diff --git a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
index 8fadb7a30cc78e0bbed45e6ebf593dd35f3a9871..b1f3586e34f335ff27de4b1b195e2bc284dbaab3 100644 (file)
--- a/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
+++ b/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/widgets/timegraph/TimeGraphViewer.java
@@ -1857,7 +1857,8 @@ public class TimeGraphViewer implements ITimeDataProvider, SelectionListener {
      * @since 1.0
      */
     public int getAvailableWidth(int requestedOffset) {
-        return fTimeAlignedComposite.getSize().x - requestedOffset;
+        int totalWidth = fTimeAlignedComposite.getSize().x;
+        return Math.min(totalWidth, Math.max(0, totalWidth - requestedOffset));
     }
 
     /**