Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2007-06-27 14:01:41 +0000
committerMichael Valenta2007-06-27 14:01:41 +0000
commit133e512425cfad0c94b82208c35b70e497d79bee (patch)
tree2d45dbf24924a16b19ace8454e627abb21ad7a8b /bundles/org.eclipse.team.cvs.ui
parent7e4a62d00699b0e0cc9cf8f051026b4b7dd00ae0 (diff)
downloadeclipse.platform.team-133e512425cfad0c94b82208c35b70e497d79bee.tar.gz
eclipse.platform.team-133e512425cfad0c94b82208c35b70e497d79bee.tar.xz
eclipse.platform.team-133e512425cfad0c94b82208c35b70e497d79bee.zip
Bug 194596 Use text editor font in commit comment editor
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java9
1 files changed, 7 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
index 1ae30bbcf..913a1a190 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CommitCommentArea.java
@@ -20,6 +20,7 @@ import org.eclipse.core.resources.IProject;
import org.eclipse.jface.dialogs.*;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.IPreferenceStore;
+import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.text.*;
import org.eclipse.jface.text.source.*;
import org.eclipse.swt.SWT;
@@ -63,9 +64,14 @@ public class CommitCommentArea extends DialogArea {
cc.setLayoutData(new GridData(GridData.FILL_BOTH));
SourceViewer sourceViewer = new SourceViewer(cc, null, null, true, SWT.MULTI | SWT.V_SCROLL | SWT.WRAP);
- sourceViewer.getTextWidget().setIndent(2);
+ fTextField = sourceViewer.getTextWidget();
+
+ fTextField.setFont(JFaceResources.getFont(JFaceResources.TEXT_FONT));
+ fTextField.setIndent(2);
final SourceViewerDecorationSupport support = new SourceViewerDecorationSupport(sourceViewer, null, annotationAccess, EditorsUI.getSharedTextColors());
+ support.setMarginPainterPreferenceKeys(AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLOR, AbstractDecoratedTextEditorPreferenceConstants.EDITOR_PRINT_MARGIN_COLUMN);
+
Iterator e= new MarkerAnnotationPreferences().getAnnotationPreferences().iterator();
while (e.hasNext())
support.setAnnotationPreference((AnnotationPreference) e.next());
@@ -86,7 +92,6 @@ public class CommitCommentArea extends DialogArea {
// Hyperlink coloring to work. (Presenter needs document object up front)
sourceViewer.configure(new TextSourceViewerConfiguration(EditorsUI.getPreferenceStore()));
sourceViewer.setDocument(document, annotationModel);
- fTextField = sourceViewer.getTextWidget();
fTextField.addTraverseListener(this);
fTextField.addModifyListener(this);

Back to the top