Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for rendering issue with embedded props editor

Browse Source 
See: https://github.com/spring-projects/sts4/issues/611
This commit is contained in:
Kris De Volder
2021-05-04 14:48:11 -07:00
parent e125871239
commit c917df2ced
8 changed files with 11 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eclipse-extensions/org.springframework.ide.eclipse.boot.launch/.project
View File

@@ -20,14 +20,8 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>

11
eclipse-extensions/org.springframework.ide.eclipse.boot.launch/src/org/springframework/ide/eclipse/boot/launch/properties/EmbeddedEditor.java
View File

@@ -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) {