Attachment 97481 Details for Bug 205474 – Updated patch to directly use DEFAULT_FONT in HC where no default

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Updated patch to directly use DEFAULT_FONT in HC where no default

patch205474-2.txt (text/plain), 1.70 KB, created by Kevin McGuire

on 2008-04-24 12:04:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Kevin McGuire

Created: 2008-04-24 12:04:26 EDT

Size: 1.70 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java,v
>retrieving revision 1.19
>diff -u -r1.19 ThemeElementHelper.java
>--- Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java	3 Dec 2007 20:07:25 -0000	1.19
>+++ Eclipse UI/org/eclipse/ui/internal/themes/ThemeElementHelper.java	24 Apr 2008 16:03:16 -0000
>@@ -21,6 +21,7 @@
> import org.eclipse.jface.resource.JFaceResources;
> import org.eclipse.swt.graphics.FontData;
> import org.eclipse.swt.graphics.RGB;
>+import org.eclipse.swt.widgets.Display;
> import org.eclipse.ui.internal.Workbench;
> import org.eclipse.ui.internal.WorkbenchPlugin;
> import org.eclipse.ui.themes.ITheme;
>@@ -109,8 +110,16 @@
>                     .getInstance().getDisplay());
> 		} else {
>             // values pushed in from jface property files.  Very ugly.
>-			defaultFont = registry.bestDataArray(JFaceResources.getFontRegistry().getFontData(id),
>-                    Workbench.getInstance().getDisplay());
>+			Display display = Workbench.getInstance().getDisplay();
>+			
>+			//If in high contrast, ignore the defaults in jface and use the default (system) font.
>+			//This is a hack to address bug #205474. See bug #228207 for a future fix.
>+			FontData[] fontData = JFaceResources.getFontRegistry().getFontData(
>+				display.getHighContrast()
>+					? JFaceResources.DEFAULT_FONT
>+					: id
>+			);
>+			defaultFont = registry.bestDataArray(fontData, display);
>         }
> 
>         if (setInRegistry) {

Actions: View | Diff

Attachments on bug 205474: 79751 | 97026 | 97481