Attachment 144893 Details for Bug 256699 – patch v2.2

[patch] patch v2.2

clipboard.txt (text/plain), 3.98 KB, created by Thomas Ehrnhoefer

on 2009-08-18 20:03:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2009-08-18 20:03:27 EDT

Size: 3.98 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java,v
>retrieving revision 1.43
>diff -u -r1.43 RichTextAttributeEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java	14 Aug 2009 04:49:41 -0000	1.43
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java	19 Aug 2009 00:04:04 -0000
>@@ -167,8 +167,8 @@
> 	@Override
> 	protected void decorateIncoming(Color color) {
> 		super.decorateIncoming(color);
>-		if (getEditorViewer() != null && getEditorViewer().getTextWidget() != null) {
>-			getEditorViewer().getTextWidget().setBackground(color);
>+		if (editor != null) {
>+			editor.setBackground(color);
> 		}
> 	}
> 
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java,v
>retrieving revision 1.6
>diff -u -r1.6 RichTextEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java	14 Aug 2009 04:49:41 -0000	1.6
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java	19 Aug 2009 00:04:05 -0000
>@@ -45,6 +45,7 @@
> import org.eclipse.swt.events.FocusListener;
> import org.eclipse.swt.events.MouseAdapter;
> import org.eclipse.swt.events.MouseEvent;
>+import org.eclipse.swt.graphics.Color;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.widgets.Composite;
>@@ -339,8 +340,11 @@
> 		return mode;
> 	}
> 
>+	/**
>+	 * @return The preview source viewer or null if there is no extension available or the attribute is read only
>+	 */
> 	private SourceViewer getPreviewViewer() {
>-		if (extension == null) {
>+		if (extension == null || readOnly) {
> 			return null;
> 		}
> 
>@@ -357,6 +361,8 @@
> 			previewViewer.getControl().setData(EditorUtil.KEY_TOGGLE_TO_MAXIMIZE_ACTION,
> 					editorViewer.getControl().getData(EditorUtil.KEY_TOGGLE_TO_MAXIMIZE_ACTION));
> 			installMenu(previewViewer.getControl(), editorViewer.getControl().getMenu());
>+			//set the background color in case there is an incoming to show
>+			previewViewer.getTextWidget().setBackground(editorComposite.getBackground());
> 		}
> 		return previewViewer;
> 	}
>@@ -562,7 +568,7 @@
> 	}
> 
> 	private void showPreview(boolean sticky) {
>-		if (!isReadOnly()) {
>+		if (!isReadOnly() && getPreviewViewer() != null) {
> 			show(getPreviewViewer());
> 			stickyPreview = sticky;
> 		}
>@@ -586,7 +592,7 @@
> 	}
> 
> 	public void enableAutoTogglePreview() {
>-		if (getPreviewViewer() != null) {
>+		if (!readOnly && getPreviewViewer() != null) {
> 			show(getPreviewViewer());
> 			previewViewer.getTextWidget().addMouseListener(new MouseAdapter() {
> 				@Override
>@@ -610,4 +616,27 @@
> 		}
> 	}
> 
>+	/**
>+	 * Sets the background color for all instantiated viewers
>+	 * 
>+	 * @param color
>+	 */
>+	public void setBackground(Color color) {
>+		if (editorComposite != null && !editorComposite.isDisposed()) {
>+			editorComposite.setBackground(color);
>+		}
>+		//set color for all instantiated viewers/editors
>+		if (defaultViewer != null && defaultViewer.getTextWidget() != null
>+				&& !defaultViewer.getTextWidget().isDisposed()) {
>+			defaultViewer.getTextWidget().setBackground(color);
>+		}
>+		if (editorViewer != null && editorViewer.getTextWidget() != null && !editorViewer.getTextWidget().isDisposed()) {
>+			editorViewer.getTextWidget().setBackground(color);
>+		}
>+		if (previewViewer != null && previewViewer.getTextWidget() != null
>+				&& !previewViewer.getTextWidget().isDisposed()) {
>+			previewViewer.getTextWidget().setBackground(color);
>+		}
>+	}
>+
> }

Actions: View | Diff

Attachments on bug 256699: 144163 | 144164 | 144335 | 144336 | 144338 | 144339 | 144578 | 144579 | 144582 | 144583 | 144893 | 144894 | 145048 | 145049 | 145156 | 148035