diff options
| author | Lakshmi Shanmugam | 2020-10-23 15:00:56 +0000 |
|---|---|---|
| committer | Lakshmi P Shanmugam | 2021-05-31 12:40:41 +0000 |
| commit | a8792341d02612ec9c3a7bb9eddddcfbd0fdf8a7 (patch) | |
| tree | 3c2edf7247a3e9c81e440df839123b78514430d8 | |
| parent | 050e9b8af99bd79406c700e79b94c40a3d13f584 (diff) | |
| download | eclipse.platform.swt-a8792341d02612ec9c3a7bb9eddddcfbd0fdf8a7.tar.gz eclipse.platform.swt-a8792341d02612ec9c3a7bb9eddddcfbd0fdf8a7.tar.xz eclipse.platform.swt-a8792341d02612ec9c3a7bb9eddddcfbd0fdf8a7.zip | |
Bug 567389 - [Big Sur] Selected TabFolder's text is invisible on macOS
11
On BigSur, alternateSelectedControlTextColor doesn't give the correct
foreground color for selected TabItem.
Change-Id: I2a9b0bd545eb1cf76878ad3d24cc2a72ece631c1
Signed-off-by: Lakshmi Shanmugam <lshanmug@in.ibm.com>(cherry picked
from commit 4485d6db71223cb913565a70f62efe6d51392162)
(cherry picked from commit 35f498ace1775764c94619803ff01347bd4886e7)
Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.swt/+/180989
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java | 2 | ||||
| -rw-r--r-- | bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java index 93b790cdf7..3a1bc2ee37 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java +++ b/bundles/org.eclipse.swt/Eclipse SWT PI/cocoa/org/eclipse/swt/internal/cocoa/OS.java @@ -229,7 +229,7 @@ public class OS extends C { * Currently Big Sur OS version matches with 10.16 and not 11.0. This may be temporary. * Creating a method, so that it can be fixed in one place if/when this changes. */ - return OS.VERSION >= OS.VERSION_MMB(10, 16, 0); + return OS.VERSION_MMB >= OS.VERSION_MMB(10, 16, 0); } /** JNI natives */ diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java index a31be56d73..37af08eb86 100644 --- a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java +++ b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/TabItem.java @@ -463,9 +463,13 @@ void updateText (boolean selected) { if (attriStr != null) { attriStr.release(); } - double /*float*/ [] foreground = parent.foreground; - if (foreground == null && selected && OS.VERSION >= 0x1070) { - foreground = display.getNSColorRGB(NSColor.alternateSelectedControlTextColor()); + double [] foreground = parent.foreground; + if (foreground == null) { + if (selected) { + foreground = OS.isBigSurOrLater() ? display.selectedControlTextColor : display.alternateSelectedControlTextColor; + } else { + foreground = parent.defaultForeground().handle; + } } attriStr = parent.createString(text, null, foreground, 0, false, true, true); //force parent to resize |