From c917df2ced1a37379a52d9fb318000f872089313 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 4 May 2021 14:48:11 -0700 Subject: [PATCH] Fix for rendering issue with embedded props editor See: https://github.com/spring-projects/sts4/issues/611 --- .../.project | 6 ------ .../.project | 6 ------ .../boot/launch/properties/EmbeddedEditor.java | 11 +++++++++++ .../.project | 5 ----- .../.project | 6 ------ .../.project | 6 ------ .../.project | 6 ------ .../org.springframework.ide.eclipse.boot/.project | 6 ------ 8 files changed, 11 insertions(+), 41 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/.project index bcdf4c924..f9e525d68 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/.project index a10b6c82f..d4881d4ec 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/properties/EmbeddedEditor.java b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/properties/EmbeddedEditor.java index 918e2ef4a..76e2351eb 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/properties/EmbeddedEditor.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/properties/EmbeddedEditor.java @@ -21,8 +21,11 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.ListenerList; import org.eclipse.core.runtime.Status; +import org.eclipse.jdt.ui.PreferenceConstants; import org.eclipse.jface.action.IAction; import org.eclipse.jface.preference.IPreferenceStore; +import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.resource.JFaceResources; import org.eclipse.jface.text.Document; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IRegion; @@ -41,6 +44,9 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration; import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.jface.viewers.ISelectionProvider; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StyledText; +import org.eclipse.swt.graphics.Font; +import org.eclipse.swt.graphics.FontData; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -142,6 +148,8 @@ public class EmbeddedEditor implements ITextEditor { private DefaultMarkerAnnotationAccess fileMarkerAnnotationAccess; + private Font font; + public EmbeddedEditor(ViewerConfigurationFactory viewerConfigFactory, IPreferenceStore prefStore, boolean withHandlers, boolean withDecorations) { this.viewerConfigFactory = viewerConfigFactory; this.prefStore = prefStore; @@ -267,6 +275,9 @@ public class EmbeddedEditor implements ITextEditor { IAnnotationModel annotationModel = provider.getAnnotationModel(editorInput); viewer.setDocument(document, annotationModel); viewer.setEditable(this.isEditable()); + StyledText textWidget = viewer.getTextWidget(); + Font font = JFaceResources.getTextFont(); + textWidget.setFont(font); } private void updateDocumentProvider(IEditorInput editorInput) { diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/.project index 65638f87b..0a2612801 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring/.project @@ -20,11 +20,6 @@ - - org.eclipse.m2e.core.maven2Builder - - - org.eclipse.m2e.core.maven2Nature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/.project index e6d1f19fa..992f29f5a 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.restart/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/.project index 845454571..c4505cfb6 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.templates/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/.project index 59c88e403..24f10a44e 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/.project b/eclipse-extensions/org.springframework.ide.eclipse.boot/.project index a67264b9e..ade32c790 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot/.project +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/.project @@ -20,14 +20,8 @@ - - org.eclipse.m2e.core.maven2Builder - - - - org.eclipse.m2e.core.maven2Nature org.eclipse.pde.PluginNature org.eclipse.jdt.core.javanature