Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLakshmi Priya Shanmugam2018-11-19 10:47:58 +0000
committerLakshmi Shanmugam2018-11-19 12:19:24 +0000
commit177d800acd913c62eb4c5f0143a8a9e0aea55c7f (patch)
treec332cd1e66a34aa72e461d84138d928ac674e051
parent11fa45c7d8835ec977c5d6d6bfefc6821ad9237e (diff)
downloadeclipse.platform.ui-177d800acd913c62eb4c5f0143a8a9e0aea55c7f.tar.gz
eclipse.platform.ui-177d800acd913c62eb4c5f0143a8a9e0aea55c7f.tar.xz
eclipse.platform.ui-177d800acd913c62eb4c5f0143a8a9e0aea55c7f.zip
Bug 537812 - Heap status indicator renders with black text and black bar
on macOS 10.14 Changed usedMemCol to use a fixed color (shade of gray) instead of a SWT color constant. sepCol, topLeftCol and armCol also use the same color. This change affects all platforms Change-Id: I99deae461268e777028c16a9f373527e785b3ea8 Signed-off-by: Lakshmi Priya Shanmugam <lshanmug@in.ibm.com>
-rw-r--r--bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
index b21aaca3de0..3cb586188bf 100644
--- a/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
+++ b/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/HeapStatus.java
@@ -26,7 +26,6 @@ import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.Util;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
@@ -131,15 +130,11 @@ public class HeapStatus extends Composite {
disabledGcImage = new Image(display, gcImage, SWT.IMAGE_DISABLE);
}
- if (Util.isGtk()) {
- usedMemCol = display.getSystemColor(SWT.COLOR_TITLE_INACTIVE_FOREGROUND);
- } else {
- usedMemCol = display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
- }
+ usedMemCol = new Color(display, 160, 160, 160); // gray
lowMemCol = new Color(display, 255, 70, 70); // medium red
freeMemCol = new Color(display, 255, 190, 125); // light orange
+ sepCol = topLeftCol = armCol = usedMemCol;
bgCol = display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND);
- sepCol = topLeftCol = armCol = display.getSystemColor(SWT.COLOR_WIDGET_NORMAL_SHADOW);
bottomRightCol = display.getSystemColor(SWT.COLOR_WIDGET_HIGHLIGHT_SHADOW);
markCol = textCol = display.getSystemColor(SWT.COLOR_WIDGET_FOREGROUND);
@@ -271,6 +266,9 @@ public class HeapStatus extends Composite {
disabledGcImage.dispose();
}
+ if (usedMemCol != null) {
+ usedMemCol.dispose();
+ }
if (lowMemCol != null) {
lowMemCol.dispose();
}

Back to the top