Attachment #4190 for bug #35130

Lines 333-338 Link Here

(-)search/org/eclipse/search/internal/ui/SearchDialog.java (-1 / +3 lines)
333		333
334	Control result= super.createButtonBar(composite);	334	Control result= super.createButtonBar(composite);
335	getButton(IDialogConstants.FINISH_ID).setEnabled(fDescriptors.size() > 0);	335	getButton(IDialogConstants.FINISH_ID).setEnabled(fDescriptors.size() > 0);
		336	applyDialogFont(result);
336	return result;	337	return result;
337	}	338	}
338		339
Lines 522-528 Link Here
522	c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	523	c.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
523	c.setLayout(layout);	524	c.setLayout(layout);
524	fScopeParts[index]= new ScopePart(this);	525	fScopeParts[index]= new ScopePart(this);
525	fScopeParts[index].createPart(c);	526	Control part= fScopeParts[index].createPart(c);
		527	applyDialogFont(part);
526	fScopeParts[index].setVisible(true);	528	fScopeParts[index].setVisible(true);
527	}	529	}
528	}	530	}

Lines 186-191 Link Here

(-)search/org/eclipse/search/internal/ui/text/ReplaceDialog.java (+1 lines)
186	gd.horizontalSpan= 2;	186	gd.horizontalSpan= 2;
187	fSaveButton.setLayoutData(gd);	187	fSaveButton.setLayoutData(gd);
188		188
		189	applyDialogFont(result);
189	return result;	190	return result;
190	}	191	}
191		192

Lines 41-46 Link Here

(-)search/org/eclipse/search/internal/ui/text/TextSearchPage.java (-1 / +2 lines)
41	import org.eclipse.swt.widgets.Label;	41	import org.eclipse.swt.widgets.Label;
42	import org.eclipse.swt.widgets.Shell;	42	import org.eclipse.swt.widgets.Shell;
43		43
		44	import org.eclipse.jface.dialogs.Dialog;
44	import org.eclipse.jface.dialogs.DialogPage;	45	import org.eclipse.jface.dialogs.DialogPage;
45	import org.eclipse.jface.dialogs.ErrorDialog;	46	import org.eclipse.jface.dialogs.ErrorDialog;
46	import org.eclipse.jface.dialogs.IDialogSettings;	47	import org.eclipse.jface.dialogs.IDialogSettings;
Lines 296-302 Link Here
296	layouter.perform(createFileNamePatternComposite(result));	297	layouter.perform(createFileNamePatternComposite(result));
297		298
298	setControl(result);	299	setControl(result);
299		300	Dialog.applyDialogFont(result);
300	WorkbenchHelp.setHelp(result, ISearchHelpContextIds.TEXT_SEARCH_PAGE);	301	WorkbenchHelp.setHelp(result, ISearchHelpContextIds.TEXT_SEARCH_PAGE);
301	}	302	}
302		303

Lines 130-135 Link Here

(-)search/org/eclipse/search/internal/ui/util/ExtendedDialogWindow.java (+1 lines)
130	Label separator= new Label(result, SWT.SEPARATOR \| SWT.HORIZONTAL);	130	Label separator= new Label(result, SWT.SEPARATOR \| SWT.HORIZONTAL);
131	separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	131	separator.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
132		132
		133	applyDialogFont(result);
133	return result;	134	return result;
134	}	135	}
135		136

Lines 67-72 Link Here

(-)search/org/eclipse/search/internal/ui/util/ListDialog.java (+2 lines)
67	GridData gd= new GridData(GridData.FILL_BOTH);	67	GridData gd= new GridData(GridData.FILL_BOTH);
68	gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);	68	gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);
69	label.setLayoutData(gd);	69	label.setLayoutData(gd);
		70	applyDialogFont(label);
70	return label;	71	return label;
71	}	72	}
72		73
Lines 95-100 Link Here
95	gd.heightHint= convertHeightInCharsToPixels(15);	96	gd.heightHint= convertHeightInCharsToPixels(15);
96	gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);	97	gd.widthHint= convertWidthInCharsToPixels(WIDTH_IN_CHARACTERS);
97	table.setLayoutData(gd);	98	table.setLayoutData(gd);
		99	applyDialogFont(table);
98	return table;	100	return table;
99	}	101	}
100		102

Lines 27-32 Link Here

(-)search/org/eclipse/search/internal/ui/util/SWTUtil.java (+5 lines)
27	import org.eclipse.swt.widgets.Widget;	27	import org.eclipse.swt.widgets.Widget;
28		28
29	import org.eclipse.jface.dialogs.IDialogConstants;	29	import org.eclipse.jface.dialogs.IDialogConstants;
		30	import org.eclipse.jface.resource.JFaceResources;
30	import org.eclipse.jface.util.Assert;	31	import org.eclipse.jface.util.Assert;
31		32
32	/**	33	/**
Lines 111-116 Link Here
111	* Returns a width hint for a button control.	112	* Returns a width hint for a button control.
112	*/	113	*/
113	public static int getButtonWidthHint(Button button) {	114	public static int getButtonWidthHint(Button button) {
		115	if (button.getFont().equals(JFaceResources.getDefaultFont()))
		116	button.setFont(JFaceResources.getDialogFont());
114	if (fgHorizontalDialogUnitSize == 0.0) {	117	if (fgHorizontalDialogUnitSize == 0.0) {
115	initializeDialogUnits(button);	118	initializeDialogUnits(button);
116	}	119	}
Lines 122-127 Link Here
122	* Returns a height hint for a button control.	125	* Returns a height hint for a button control.
123	*/	126	*/
124	public static int getButtonHeigthHint(Button button) {	127	public static int getButtonHeigthHint(Button button) {
		128	if (button.getFont().equals(JFaceResources.getDefaultFont()))
		129	button.setFont(JFaceResources.getDialogFont());
125	if (fgHorizontalDialogUnitSize == 0.0) {	130	if (fgHorizontalDialogUnitSize == 0.0) {
126	initializeDialogUnits(button);	131	initializeDialogUnits(button);
127	}	132	}

Lines 205-210 Link Here

(-)search/org/eclipse/search/internal/ui/util/TypeFilteringDialog.java (+1 lines)
205	if (fInitialSelections != null && !fInitialSelections.isEmpty())	205	if (fInitialSelections != null && !fInitialSelections.isEmpty())
206	checkInitialSelections();	206	checkInitialSelections();
207		207
		208	applyDialogFont(composite);
208	return composite;	209	return composite;
209	}	210	}
210		211

Return to bug 35130