Attachment 104721 Details for Bug 235222 – patch fixes layout issues and cut/copy/paste actions, and preview scrollbar

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch fixes layout issues and cut/copy/paste actions, and preview scrollbar

mylyn.sandbox.patch3.txt (text/plain), 3.61 KB, created by David Green

on 2008-06-12 12:09:00 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: David Green

Created: 2008-06-12 12:09:00 EDT

Size: 3.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.sandbox.ui
>Index: src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleRichTextAttributeEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/sandbox/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleRichTextAttributeEditor.java,v
>retrieving revision 1.1
>diff -u -r1.1 ExtensibleRichTextAttributeEditor.java
>--- src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleRichTextAttributeEditor.java	12 Jun 2008 10:53:40 -0000	1.1
>+++ src/org/eclipse/mylyn/internal/sandbox/ui/editors/ExtensibleRichTextAttributeEditor.java	12 Jun 2008 16:06:22 -0000
>@@ -8,12 +8,15 @@
> 
> package org.eclipse.mylyn.internal.sandbox.ui.editors;
> 
>+import org.eclipse.jface.layout.GridDataFactory;
> import org.eclipse.jface.text.Document;
> import org.eclipse.jface.text.ITextListener;
> import org.eclipse.jface.text.TextEvent;
>+import org.eclipse.jface.text.source.AnnotationModel;
> import org.eclipse.jface.text.source.SourceViewer;
> import org.eclipse.jface.viewers.Viewer;
> import org.eclipse.mylyn.internal.provisional.commons.ui.CommonThemes;
>+import org.eclipse.mylyn.internal.tasks.ui.editors.EditorUtil;
> import org.eclipse.mylyn.internal.tasks.ui.editors.RichTextAttributeEditor;
> import org.eclipse.mylyn.tasks.core.TaskRepository;
> import org.eclipse.mylyn.tasks.core.data.TaskAttribute;
>@@ -28,6 +31,7 @@
> import org.eclipse.swt.events.SelectionEvent;
> import org.eclipse.swt.events.SelectionListener;
> import org.eclipse.swt.graphics.Font;
>+import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.ui.PlatformUI;
> import org.eclipse.ui.contexts.IContextActivation;
>@@ -42,6 +46,7 @@
>  * create its own SourceViewer without overriding createControl and copying the code in it
>  * 
>  * @author Jingwen Ou
>+ * @author David Green added context activation, layout
>  */
> public class ExtensibleRichTextAttributeEditor extends RichTextAttributeEditor {
> 
>@@ -78,9 +83,10 @@
> 			source = extension.createViewer(taskRepository, parent, styles);
> 			source.setDocument(new Document(getValue()));
> 
>-			setControl(source instanceof Viewer ? ((Viewer) source).getControl() : source.getTextWidget());
>+			setControl(source.getControl());
> 		} else {
> 			CTabFolder folder = new CTabFolder(parent, SWT.FLAT | SWT.BOTTOM);
>+			folder.setLayout(new GridLayout());
> 
> 			/** wikitext markup editor **/
> 
>@@ -89,8 +95,13 @@
> 			viewerItem.setToolTipText("Edit Source");
> 
> 			source = extension.createEditor(taskRepository, folder, styles | SWT.V_SCROLL);
>+			source.getControl().setLayoutData(GridDataFactory.fillDefaults().grab(true, true).create());
>+
>+			// we must do this otherwise the cut/copy/paste commands don't work
>+			EditorUtil.setTextViewer(source.getTextWidget(), source);
>+
> 			if (source.getDocument() == null) {
>-				source.setDocument(new Document(getValue()));
>+				source.setDocument(new Document(getValue()), new AnnotationModel());
> 			}
> 			source.addTextListener(new ITextListener() {
> 				public void textChanged(TextEvent event) {
>@@ -131,7 +142,7 @@
> 			previewItem.setText("Preview");
> 			previewItem.setToolTipText("Preview Source");
> 
>-			final SourceViewer preview = extension.createViewer(taskRepository, folder, styles);
>+			final SourceViewer preview = extension.createViewer(taskRepository, folder, styles | SWT.V_SCROLL);
> 
> 			previewItem.setControl(preview instanceof Viewer ? ((Viewer) preview).getControl()
> 					: preview.getTextWidget());
>@@ -173,4 +184,5 @@
> 			contextActivation = contextService.activateContext(extension.getEditorContextId());
> 		}
> 	}
>+
> }

Actions: View | Diff

Attachments on bug 235222: 103264 | 103615 | 104084 | 104233 | 104234 | 104240 | 104576 | 104592 | 104650 | 104651 | 104678 | 104721