Attachment #175226 for bug #318243

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

View | Details | Raw Unified | Return to bug 318243
Collapse All | Expand All

Lines 725-730 Link Here

(-)ui/org/eclipse/jdt/internal/ui/infoviews/JavadocView.java (-2 / +6 lines)
725	}	725	}
726	}	726	}
727		727
		728	private static String getStyleSheet() {
		729	return HTMLPrinter.convertInfoTextColor(fgStyleSheet);
		730	}
		731
728	/*	732	/*
729	* @see AbstractInfoView#createActions()	733	* @see AbstractInfoView#createActions()
730	*/	734	*/
Lines 854-860 Link Here
854	IJavaElement input= getInput();	858	IJavaElement input= getInput();
855	if (input == null) {	859	if (input == null) {
856	StringBuffer buffer= new StringBuffer(""); //$NON-NLS-1$	860	StringBuffer buffer= new StringBuffer(""); //$NON-NLS-1$
857	HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, fgStyleSheet);	861	HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, getStyleSheet());
858	doSetInput(buffer.toString());	862	doSetInput(buffer.toString());
859	} else {	863	} else {
860	doSetInput(computeInput(input));	864	doSetInput(computeInput(input));
Lines 1128-1134 Link Here
1128		1132
1129	boolean flushContent= true;	1133	boolean flushContent= true;
1130	if (buffer.length() > 0 \|\| flushContent) {	1134	if (buffer.length() > 0 \|\| flushContent) {
1131	HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, fgStyleSheet);	1135	HTMLPrinter.insertPageProlog(buffer, 0, null, fBackgroundColorRGB, getStyleSheet());
1132	if (base != null) {	1136	if (base != null) {
1133	int endHeadIdx= buffer.indexOf("</head>"); //$NON-NLS-1$	1137	int endHeadIdx= buffer.indexOf("</head>"); //$NON-NLS-1$
1134	buffer.insert(endHeadIdx, "\n<base href='" + base + "'>\n"); //$NON-NLS-1$ //$NON-NLS-2$	1138	buffer.insert(endHeadIdx, "\n<base href='" + base + "'>\n"); //$NON-NLS-1$ //$NON-NLS-2$

Lines 621-626 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/AbstractJavaCompletionProposal.java (+1 lines)
621	if (css != null) {	621	if (css != null) {
622	FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];	622	FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];
623	css= HTMLPrinter.convertTopLevelFont(css, fontData);	623	css= HTMLPrinter.convertTopLevelFont(css, fontData);
		624	css= HTMLPrinter.convertInfoTextColor(css);
624	}	625	}
625	return css;	626	return css;
626	}	627	}

Lines 842-847 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/hover/JavadocHover.java (+1 lines)
842	if (css != null) {	842	if (css != null) {
843	FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];	843	FontData fontData= JFaceResources.getFontRegistry().getFontData(PreferenceConstants.APPEARANCE_JAVADOC_FONT)[0];
844	css= HTMLPrinter.convertTopLevelFont(css, fontData);	844	css= HTMLPrinter.convertTopLevelFont(css, fontData);
		845	css= HTMLPrinter.convertInfoTextColor(css);
845	}	846	}
846		847
847	return css;	848	return css;

Lines 278-284 Link Here

(-)ui/org/eclipse/jdt/internal/ui/text/java/hover/SourceViewerInformationControl.java (-1 / +5 lines)
278		278
279	if (Math.abs(infoBgHSB[2] - javaDefaultHSB[2]) < 0.5f) {	279	if (Math.abs(infoBgHSB[2] - javaDefaultHSB[2]) < 0.5f) {
280	// workaround for dark tooltip background color, see https://bugs.eclipse.org/309334	280	// workaround for dark tooltip background color, see https://bugs.eclipse.org/309334
281	return PreferenceConverter.getColor(JavaPlugin.getDefault().getCombinedPreferenceStore(), AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);	281	IPreferenceStore preferenceStore= JavaPlugin.getDefault().getCombinedPreferenceStore();
		282	boolean useDefault= preferenceStore.getBoolean(AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND_SYSTEM_DEFAULT);
		283	if (useDefault)
		284	return display.getSystemColor(SWT.COLOR_LIST_BACKGROUND).getRGB();
		285	return PreferenceConverter.getColor(preferenceStore, AbstractTextEditor.PREFERENCE_COLOR_BACKGROUND);
282	}	286	}
283	return null;	287	return null;
284	}	288	}

Return to bug 318243