Attachment 205532 Details for Bug 361147 – Draft patch

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

[patch] Draft patch

bug-361147-support-scrolling-and-focus-in-review-com.patch (text/plain), 2.85 KB, created by Robert Munteanu

on 2011-10-19 10:22:57 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Munteanu

Created: 2011-10-19 10:22:57 EDT

Size: 2.85 KB

patch

obsolete

>From 820356d11616aea82af2430fdbd8f72b93ffe8d0 Wed, 19 Oct 2011 17:19:22 +0300
>From: Robert Munteanu <robert.munteanu@gmail.com>
>Date: Wed, 19 Oct 2011 17:16:46 +0300
>Subject: [PATCH] bug 361147: support scrolling and focus in review comment part
>
>When the input of the CommentPopupDialog changed, the size was not
>recomputed. We now force this behaviour.
>
>Also the 'Press F2 to focus label' has been removed, since it did not
>advertise correct functionality.
>
>diff --git a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java b/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
>index 276dca1..fbb61db 100644
>--- a/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
>+++ b/framework/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
>@@ -7,13 +7,13 @@
>  *
>  * Contributors:
>  *     Atlassian - initial API and implementation
>+ *     Robert Munteanu - fix for bug 361147
>  ******************************************************************************/
> 
> package org.eclipse.mylyn.internal.reviews.ui.annotations;
> 
> import org.eclipse.jface.action.Action;
> import org.eclipse.jface.dialogs.PopupDialog;
>-import org.eclipse.jface.layout.GridDataFactory;
> import org.eclipse.mylyn.internal.reviews.ui.IReviewActionListener;
> import org.eclipse.mylyn.internal.reviews.ui.editors.parts.TopicPart;
> import org.eclipse.swt.SWT;
>@@ -25,9 +25,7 @@
> import org.eclipse.swt.layout.GridLayout;
> import org.eclipse.swt.widgets.Composite;
> import org.eclipse.swt.widgets.Control;
>-import org.eclipse.swt.widgets.Label;
> import org.eclipse.swt.widgets.Shell;
>-import org.eclipse.ui.forms.IFormColors;
> import org.eclipse.ui.forms.widgets.FormToolkit;
> 
> /**
>@@ -46,8 +44,6 @@
> 	private FormToolkit toolkit;
> 
> 	private Composite composite;
>-
>-	private Label focusLabel;
> 
> 	private ScrolledComposite scrolledComposite;
> 
>@@ -90,14 +86,14 @@
> 	public void setFocus() {
> 		getShell().forceFocus();
> 
>-		if (focusLabel != null) {
>-			focusLabel.dispose();
>-		}
>-
> 		if (composite.getChildren().length > 0) {
> 			composite.getChildren()[0].setFocus();
> 		}
> 
>+		recomputeSize();
>+	}
>+
>+	private void recomputeSize() {
> 		Point computeSize = composite.computeSize(SWT.DEFAULT, SWT.DEFAULT);
> 		if (computeSize.y > scrolledComposite.getSize().y) {
> 			scrolledComposite.setExpandVertical(false);
>@@ -185,9 +181,8 @@
> 
> 				getShell().setBackground(toolkit.getColors().getBackground());
> 			}
>-			focusLabel = toolkit.createLabel(composite, "Press 'F2' for focus.");
>-			focusLabel.setForeground(toolkit.getColors().getColor(IFormColors.TITLE));
>-			GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.CENTER).applyTo(focusLabel);
>+
>+			recomputeSize();
> 		} else {
> 			input = null;
> 		}

Actions: View | Diff

Attachments on bug 361147: 205334 | 205519 | 205532