tmf.ui: [Bug 564001] Fix zoom selection color in XY charts
Makes zoom and selection the same color in:
* XY
* Density
Change-Id: Ica71539b295bce0fbc0070837e5fbb7771f3af8b
Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/164570
Reviewed-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Patrick Tasse <patrick.tasse@gmail.com>
Tested-by: Trace Compass Bot <tracecompass-bot@eclipse.org>
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density/MouseDragZoomProvider.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density/MouseDragZoomProvider.java
index c04f8a4..aae7951 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density/MouseDragZoomProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density/MouseDragZoomProvider.java
@@ -114,13 +114,15 @@
IAxis xAxis = getChart().getAxisSet().getXAxis(0);
int startX = xAxis.getPixelCoordinate(fStartCoordinate);
int endX = xAxis.getPixelCoordinate(fEndCoordinate);
-
- e.gc.setBackground(getChart().getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
+ int prevAlpha = e.gc.getAlpha();
+ e.gc.setAlpha(64);
+ e.gc.setBackground(e.gc.getDevice().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
if (fStartCoordinate < fEndCoordinate) {
e.gc.fillRectangle(startX, 0, endX - startX, e.height);
} else {
e.gc.fillRectangle(endX, 0, startX - endX, e.height);
}
+ e.gc.setAlpha(prevAlpha);
e.gc.drawLine(startX, 0, startX, e.height);
e.gc.drawLine(endX, 0, endX, e.height);
}
@@ -128,6 +130,6 @@
@Override
public boolean drawBehindSeries() {
- return true;
+ return false;
}
}
\ No newline at end of file
diff --git a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density2/MouseDragZoomProvider.java b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density2/MouseDragZoomProvider.java
index a79f166..0ec4f1e 100644
--- a/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density2/MouseDragZoomProvider.java
+++ b/analysis/org.eclipse.tracecompass.analysis.timing.ui/src/org/eclipse/tracecompass/internal/analysis/timing/ui/views/segmentstore/density2/MouseDragZoomProvider.java
@@ -96,13 +96,15 @@
IAxis xAxis = getXAxis();
int startX = xAxis.getPixelCoordinate(fStartCoordinate);
int endX = xAxis.getPixelCoordinate(fEndCoordinate);
-
- e.gc.setBackground(e.gc.getDevice().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
+ int prevAlpha = e.gc.getAlpha();
+ e.gc.setAlpha(64);
+ e.gc.setBackground(e.gc.getDevice().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
if (fStartCoordinate < fEndCoordinate) {
e.gc.fillRectangle(startX, 0, endX - startX, e.height);
} else {
e.gc.fillRectangle(endX, 0, startX - endX, e.height);
}
+ e.gc.setAlpha(prevAlpha);
e.gc.drawLine(startX, 0, startX, e.height);
e.gc.drawLine(endX, 0, endX, e.height);
}
@@ -110,6 +112,6 @@
@Override
public boolean drawBehindSeries() {
- return true;
+ return false;
}
}
\ No newline at end of file
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xychart/TmfMouseDragZoomProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xychart/TmfMouseDragZoomProvider.java
index 76a278a..c88eb0f 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xychart/TmfMouseDragZoomProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xychart/TmfMouseDragZoomProvider.java
@@ -124,13 +124,15 @@
IAxis xAxis = getXAxis();
int startX = xAxis.getPixelCoordinate(fStartTime);
int endX = xAxis.getPixelCoordinate(fEndTime);
-
- e.gc.setBackground(TmfXYChartViewer.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
+ int prevAlpha = e.gc.getAlpha();
+ e.gc.setAlpha(64);
+ e.gc.setBackground(TmfXYChartViewer.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
if (fStartTime < fEndTime) {
e.gc.fillRectangle(startX, 0, endX - startX, e.height);
} else {
e.gc.fillRectangle(endX, 0, startX - endX, e.height);
}
+ e.gc.setAlpha(prevAlpha);
e.gc.drawLine(startX, 0, startX, e.height);
e.gc.drawLine(endX, 0, endX, e.height);
}
@@ -138,6 +140,6 @@
@Override
public boolean drawBehindSeries() {
- return true;
+ return false;
}
}
\ No newline at end of file
diff --git a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragZoomProvider.java b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragZoomProvider.java
index adc00a1..e3876e4 100644
--- a/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragZoomProvider.java
+++ b/tmf/org.eclipse.tracecompass.tmf.ui/src/org/eclipse/tracecompass/tmf/ui/viewers/xycharts/TmfMouseDragZoomProvider.java
@@ -144,13 +144,15 @@
IAxis xAxis = getChart().getAxisSet().getXAxis(0);
int startX = xAxis.getPixelCoordinate(fStartTime);
int endX = xAxis.getPixelCoordinate(fEndTime);
-
- e.gc.setBackground(TmfXYChartViewer.getDisplay().getSystemColor(SWT.COLOR_TITLE_INACTIVE_BACKGROUND));
+ int prevAlpha = e.gc.getAlpha();
+ e.gc.setAlpha(64);
+ e.gc.setBackground(TmfXYChartViewer.getDisplay().getSystemColor(SWT.COLOR_WIDGET_BACKGROUND));
if (fStartTime < fEndTime) {
e.gc.fillRectangle(startX, 0, endX - startX, e.height);
} else {
e.gc.fillRectangle(endX, 0, startX - endX, e.height);
}
+ e.gc.setAlpha(prevAlpha);
e.gc.drawLine(startX, 0, startX, e.height);
e.gc.drawLine(endX, 0, endX, e.height);
}
@@ -158,6 +160,6 @@
@Override
public boolean drawBehindSeries() {
- return true;
+ return false;
}
}
\ No newline at end of file
