Attachment 144335 Details for Bug 256699 – patch v2

[patch] patch v2

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

on 2009-08-12 22:00:58 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Ehrnhoefer

Created: 2009-08-12 22:00:58 EDT

Size: 7.52 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.42
>diff -u -r1.42 RichTextAttributeEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java	24 Jul 2009 12:05:45 -0000	1.42
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextAttributeEditor.java	13 Aug 2009 02:00:32 -0000
>@@ -172,4 +172,10 @@
> 		}
> 	}
> 
>+	/**
>+	 * Tries to enable auto toggling of preview (editable on click)
>+	 */
>+	public void enableAutoTogglePreview() {
>+		editor.enableAutoTogglePreview();
>+	}
> }
>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.5
>diff -u -r1.5 RichTextEditor.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java	13 Aug 2009 01:13:32 -0000	1.5
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/RichTextEditor.java	13 Aug 2009 02:00:32 -0000
>@@ -43,6 +43,8 @@
> import org.eclipse.swt.events.FocusAdapter;
> import org.eclipse.swt.events.FocusEvent;
> import org.eclipse.swt.events.FocusListener;
>+import org.eclipse.swt.events.MouseAdapter;
>+import org.eclipse.swt.events.MouseEvent;
> import org.eclipse.swt.graphics.Font;
> import org.eclipse.swt.graphics.Point;
> import org.eclipse.swt.widgets.Composite;
>@@ -138,6 +140,8 @@
> 	 */
> 	private int textVersion;
> 
>+	private boolean stickyPreview = false;
>+
> 	public RichTextEditor(TaskRepository repository, int style) {
> 		this(repository, style, null, null);
> 	}
>@@ -352,6 +356,7 @@
> 			// adapt maximize action
> 			previewViewer.getControl().setData(EditorUtil.KEY_TOGGLE_TO_MAXIMIZE_ACTION,
> 					editorViewer.getControl().getData(EditorUtil.KEY_TOGGLE_TO_MAXIMIZE_ACTION));
>+			installMenu(previewViewer.getControl(), editorViewer.getControl().getMenu());
> 		}
> 		return previewViewer;
> 	}
>@@ -550,17 +555,23 @@
> 	public void showEditor() {
> 		if (getEditorViewer() != null) {
> 			show(getEditorViewer());
>+			stickyPreview = false;
> 		} else {
> 			show(getDefaultViewer());
> 		}
> 	}
> 
>-	public void showPreview() {
>+	private void showPreview(boolean sticky) {
> 		if (!isReadOnly()) {
> 			show(getPreviewViewer());
>+			stickyPreview = sticky;
> 		}
> 	}
> 
>+	public void showPreview() {
>+		showPreview(true);
>+	}
>+
> 	private void unsetContext() {
> 		if (contextService == null) {
> 			return;
>@@ -574,4 +585,29 @@
> 	protected void valueChanged(String value) {
> 	}
> 
>+	public void enableAutoTogglePreview() {
>+		if (getPreviewViewer() != null) {
>+			show(getPreviewViewer());
>+			previewViewer.getTextWidget().addMouseListener(new MouseAdapter() {
>+				@Override
>+				public void mouseUp(MouseEvent e) {
>+					if (!stickyPreview) {
>+						int offset = previewViewer.getTextWidget().getCaretOffset();
>+						showEditor();
>+						editorViewer.getTextWidget().setCaretOffset(offset);
>+					}
>+				}
>+			});
>+			editorViewer.getTextWidget().addFocusListener(new FocusAdapter() {
>+				@Override
>+				public void focusLost(FocusEvent e) {
>+					super.focusLost(e);
>+					if (!stickyPreview) {
>+						showPreview(false);
>+					}
>+				}
>+			});
>+		}
>+	}
>+
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java,v
>retrieving revision 1.35
>diff -u -r1.35 EditorUtil.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java	11 Aug 2009 23:37:27 -0000	1.35
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/EditorUtil.java	13 Aug 2009 02:00:32 -0000
>@@ -428,6 +428,11 @@
> 	}
> 
> 	public static GridData getTextControlLayoutData(TaskFormPage page, Control control, boolean expandVertically) {
>+		return getTextControlLayoutData(page, control, expandVertically, false);
>+	}
>+
>+	public static GridData getTextControlLayoutData(TaskFormPage page, Control control, boolean expandVertically,
>+			boolean hasPreviewToggle) {
> 		final GridData gd = new GridData();
> 		// wrap text at this margin, see comment below
> 		int width = getEditorWidth(page);
>@@ -441,7 +446,9 @@
> 		// limit height to be avoid dynamic resizing of the text widget: 
> 		// MAXIMUM_HEIGHT < height < MAXIMUM_HEIGHT * 3
> 		//gd.minimumHeight = AbstractAttributeEditor.MAXIMUM_HEIGHT;
>-		gd.heightHint = Math.min(Math.max(EditorUtil.MAXIMUM_HEIGHT, size.y), EditorUtil.MAXIMUM_HEIGHT * 3);
>+		if (!hasPreviewToggle) {
>+			gd.heightHint = Math.min(Math.max(EditorUtil.MAXIMUM_HEIGHT, size.y), EditorUtil.MAXIMUM_HEIGHT * 3);
>+		}
> 		if (expandVertically) {
> 			gd.verticalAlignment = SWT.FILL;
> 			gd.grabExcessVerticalSpace = true;
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java,v
>retrieving revision 1.32
>diff -u -r1.32 TaskEditorDescriptionPart.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java	24 Jul 2009 12:05:45 -0000	1.32
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorDescriptionPart.java	13 Aug 2009 02:00:32 -0000
>@@ -122,6 +122,7 @@
> 
> 		super.createControl(parent, toolkit);
> 		addDuplicateDetection(getComposite(), toolkit);
>+		getEditor().enableAutoTogglePreview();
> 	}
> 
> 	@Override
>@@ -188,4 +189,8 @@
> 		}
> 	}
> 
>+	@Override
>+	protected boolean isAutoTogglePreview() {
>+		return !getEditor().isReadOnly() && getEditor().hasPreview();
>+	}
> }
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java,v
>retrieving revision 1.34
>diff -u -r1.34 TaskEditorRichTextPart.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java	24 Jul 2009 12:05:45 -0000	1.34
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskEditorRichTextPart.java	13 Aug 2009 02:00:32 -0000
>@@ -120,7 +120,8 @@
> 		} else {
> 			StyledText textWidget = editor.getViewer().getTextWidget();
> 			editor.getControl().setLayoutData(
>-					EditorUtil.getTextControlLayoutData(getTaskEditorPage(), textWidget, getExpandVertically()));
>+					EditorUtil.getTextControlLayoutData(getTaskEditorPage(), textWidget, getExpandVertically(),
>+							isAutoTogglePreview()));
> 			editor.getControl().setData(FormToolkit.KEY_DRAW_BORDER, FormToolkit.TEXT_BORDER);
> 		}
> 
>@@ -193,7 +194,7 @@
> 
> 			GridData gd = (GridData) getEditor().getControl().getLayoutData();
> 
>-			if (originalHeight == -1) {
>+			if (originalHeight == -1 && !isAutoTogglePreview()) { //for auto toggle editors, SWT.DEFAULT is a valid hint
> 				originalHeight = gd.heightHint;
> 			}
> 
>@@ -270,4 +271,7 @@
> 		super.fillToolBar(manager);
> 	}
> 
>+	protected boolean isAutoTogglePreview() {
>+		return false;
>+	}
> }

Actions: View | Diff

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