diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java index f4333185d8f..9a6fd47a421 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/AbstractTableInformationControl.java @@ -134,6 +134,7 @@ public AbstractTableInformationControl(Shell parent, int shellStyle, fTableViewer = createTableViewer(fComposite, controlStyle); final Table table = fTableViewer.getTable(); + table.setFont(JFaceResources.getDialogFont()); table.addKeyListener(KeyListener.keyPressedAdapter(e -> { switch (e.keyCode) { case SWT.ESC: @@ -314,10 +315,11 @@ public TableViewer getTableViewer() { protected Text createFilterText(Composite parent) { fFilterText = new Text(parent, SWT.NONE); + fFilterText.setFont(JFaceResources.getDialogFont()); GridData data = new GridData(); GC gc = new GC(parent); - gc.setFont(parent.getFont()); + gc.setFont(fFilterText.getFont()); FontMetrics fontMetrics = gc.getFontMetrics(); gc.dispose(); diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java index 83df2a75389..c04d4f885f9 100644 --- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java +++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/internal/workbench/renderers/swt/BasicPartList.java @@ -35,12 +35,9 @@ import org.eclipse.jface.viewers.ViewerComparator; import org.eclipse.swt.SWT; import org.eclipse.swt.custom.CTabItem; -import org.eclipse.swt.graphics.Font; -import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.GridData; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Table; @@ -48,28 +45,6 @@ public class BasicPartList extends AbstractTableInformationControl { private class BasicStackListLabelProvider extends ColumnLabelProvider { - private final Font boldFont; - - public BasicStackListLabelProvider() { - Font font = Display.getDefault().getSystemFont(); - FontData[] fontDatas = font.getFontData(); - for (FontData fontData : fontDatas) { - fontData.setStyle(fontData.getStyle() | SWT.BOLD); - } - boldFont = new Font(Display.getDefault(), fontDatas); - } - - @Override - public Font getFont(Object element) { - if (element instanceof MPart part) { - CTabItem item = renderer.findItemForPart(part); - if (item != null && !item.isShowing()) { - return boldFont; - } - } - return super.getFont(element); - } - @Override public String getText(Object element) { if (element instanceof MDirtyable @@ -97,11 +72,6 @@ public String getToolTipText(Object element) { public boolean useNativeToolTip(Object object) { return true; } - - @Override - public void dispose() { - boldFont.dispose(); - } } private MElementContainer input;