X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.plugin.core%2Fsrc%2Fnet%2Fmograsim%2Fplugin%2Feditors%2FMemoryEditor.java;h=028a1b5be295a41978073e10b63f079f151f09bc;hb=5f8f05cd27d2b7663e32093c3e9c542b1af9224b;hp=507adae920d02de816a733923f4f4c717228886a;hpb=371a7ef0e3f6574316d03f2e980abaa0e389c567;p=Mograsim.git

diff --git a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
index 507adae9..028a1b5b 100644
--- a/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
+++ b/plugins/net.mograsim.plugin.core/src/net/mograsim/plugin/editors/MemoryEditor.java
@@ -7,6 +7,7 @@ import java.math.BigInteger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.jface.util.IPropertyChangeListener;
 import org.eclipse.jface.util.SafeRunnable;
 import org.eclipse.jface.viewers.TableViewerColumn;
 import org.eclipse.swt.SWT;
@@ -23,6 +24,8 @@ import org.eclipse.ui.IEditorSite;
 import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.PartInitException;
 import org.eclipse.ui.part.EditorPart;
+import org.eclipse.ui.themes.ITheme;
+import org.eclipse.ui.themes.IThemeManager;
 
 import net.mograsim.machine.MainMemory;
 import net.mograsim.machine.MainMemoryDefinition;
@@ -56,6 +59,9 @@ public class MemoryEditor extends EditorPart
 
 	private final MemoryCellModifiedListener memListener;
 
+	private final static String font = "net.mograsim.plugin.memory.table_font";
+	private IPropertyChangeListener fontChangeListener;
+
 	public MemoryEditor()
 	{
 		memListener = this::cellModified;
@@ -139,12 +145,29 @@ public class MemoryEditor extends EditorPart
 		table.setLinesVisible(true);
 		viewer.setUseHashlookup(true);
 		viewer.setContentProvider(provider);
-		getSite().setSelectionProvider(viewer);// TODO what does this?
+		getSite().setSelectionProvider(viewer);// TODO what does this do?
 		viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 7, 1));
+
+		IThemeManager themeManager = getSite().getWorkbenchWindow().getWorkbench().getThemeManager();
+		themeManager.addPropertyChangeListener(fontChangeListener = (e) ->
+		{
+			if (IThemeManager.CHANGE_CURRENT_THEME.equals(e.getProperty()) || font.equals(e.getProperty()))
+			{
+				updateFont(themeManager.getCurrentTheme());
+				viewer.refresh();
+			}
+		});
+		updateFont(themeManager.getCurrentTheme());
+
 		if (memory != null)
 			viewer.setInput(memory);
 	}
 
+	private void updateFont(ITheme theme)
+	{
+		viewer.getTable().setFont(theme.getFontRegistry().get(font));
+	}
+
 	private void createColumns()
 	{
 		TableViewerColumn addrCol = createTableViewerColumn("Address", 100);
@@ -274,6 +297,7 @@ public class MemoryEditor extends EditorPart
 	@Override
 	public void dispose()
 	{
+		getSite().getWorkbenchWindow().getWorkbench().getThemeManager().removePropertyChangeListener(fontChangeListener);
 		if (memory != null)
 			memory.deregisterCellModifiedListener(memListener);
 		super.dispose();