|
Lines 21-26
Link Here
|
| 21 |
import org.eclipse.jface.resource.JFaceResources; |
21 |
import org.eclipse.jface.resource.JFaceResources; |
| 22 |
import org.eclipse.swt.graphics.FontData; |
22 |
import org.eclipse.swt.graphics.FontData; |
| 23 |
import org.eclipse.swt.graphics.RGB; |
23 |
import org.eclipse.swt.graphics.RGB; |
|
|
24 |
import org.eclipse.swt.widgets.Display; |
| 24 |
import org.eclipse.ui.internal.Workbench; |
25 |
import org.eclipse.ui.internal.Workbench; |
| 25 |
import org.eclipse.ui.internal.WorkbenchPlugin; |
26 |
import org.eclipse.ui.internal.WorkbenchPlugin; |
| 26 |
import org.eclipse.ui.themes.ITheme; |
27 |
import org.eclipse.ui.themes.ITheme; |
|
Lines 109-116
Link Here
|
| 109 |
.getInstance().getDisplay()); |
110 |
.getInstance().getDisplay()); |
| 110 |
} else { |
111 |
} else { |
| 111 |
// values pushed in from jface property files. Very ugly. |
112 |
// values pushed in from jface property files. Very ugly. |
| 112 |
defaultFont = registry.bestDataArray(JFaceResources.getFontRegistry().getFontData(id), |
113 |
Display display = Workbench.getInstance().getDisplay(); |
| 113 |
Workbench.getInstance().getDisplay()); |
114 |
|
|
|
115 |
//If in high contrast, ignore the defaults in jface and return the theme system font. |
| 116 |
//This is a hack to address bug #205474. See bug #228207 for a future fix. |
| 117 |
FontData[] fontData = display.getHighContrast() |
| 118 |
? registry.getFontData(key) |
| 119 |
: JFaceResources.getFontRegistry().getFontData(id); |
| 120 |
defaultFont = registry.bestDataArray(fontData, display); |
| 114 |
} |
121 |
} |
| 115 |
|
122 |
|
| 116 |
if (setInRegistry) { |
123 |
if (setInRegistry) { |
