Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Davis2015-08-21 21:48:15 +0000
committerSam Davis2015-08-21 21:55:49 +0000
commit2f29dc193ed772c9f2b038bc76b1488ba031ecc3 (patch)
tree603fb8c371b4efe84a8f3686ee443d673be4ed5c
parentcbc486fc22891bd2b5c8ab27bd2c9e3874f69e1b (diff)
downloadorg.eclipse.mylyn.reviews-2f29dc193ed772c9f2b038bc76b1488ba031ecc3.tar.gz
org.eclipse.mylyn.reviews-2f29dc193ed772c9f2b038bc76b1488ba031ecc3.tar.xz
org.eclipse.mylyn.reviews-2f29dc193ed772c9f2b038bc76b1488ba031ecc3.zip
468560: user can move inline comment dialog
Change-Id: If840619839bfd1946aa6af8263c3bb61038eedb8 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=468560
-rw-r--r--org.eclipse.mylyn.reviews.ui.tests/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialogTest.java16
-rw-r--r--org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java3
2 files changed, 18 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.reviews.ui.tests/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialogTest.java b/org.eclipse.mylyn.reviews.ui.tests/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialogTest.java
index eec375c4c..a6b924f06 100644
--- a/org.eclipse.mylyn.reviews.ui.tests/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialogTest.java
+++ b/org.eclipse.mylyn.reviews.ui.tests/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialogTest.java
@@ -22,6 +22,7 @@ import static org.mockito.Mockito.verify;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
@@ -32,6 +33,7 @@ import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobManager;
+import org.eclipse.mylyn.commons.ui.ShellDragSupport;
import org.eclipse.mylyn.internal.gerrit.ui.GerritReviewBehavior;
import org.eclipse.mylyn.internal.tasks.ui.TasksUiPlugin;
import org.eclipse.mylyn.reviews.core.model.IComment;
@@ -60,6 +62,9 @@ import org.eclipse.ui.forms.widgets.Section;
import org.junit.Test;
import org.mockito.ArgumentMatcher;
+import com.google.common.base.Predicate;
+import com.google.common.collect.Iterables;
+
public class CommentPopupDialogTest extends TestCase {
private final static String USER_ID = "1";
@@ -128,6 +133,17 @@ public class CommentPopupDialogTest extends TestCase {
assertNull(commentPopupDialog.getCommentEditor().getEditorComposite());
}
+ @Test
+ public void testMovable() {
+ commentPopupDialog = createPopupWithXComments(1, false);
+ Listener[] listeners = commentPopupDialog.getComposite().getListeners(SWT.MouseMove);
+ Iterables.find(Arrays.asList(listeners), new Predicate<Listener>() {
+ public boolean apply(Listener listener) {
+ return listener instanceof ShellDragSupport;
+ }
+ });
+ }
+
/**
* Tests that the comment editor closes properly
*/
diff --git a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
index ca81d2a42..f31940976 100644
--- a/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
+++ b/org.eclipse.mylyn.reviews.ui/src/org/eclipse/mylyn/internal/reviews/ui/annotations/CommentPopupDialog.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.dialogs.PopupDialog;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.text.source.LineRange;
+import org.eclipse.mylyn.commons.ui.ShellDragSupport;
import org.eclipse.mylyn.commons.workbench.forms.CommonFormUtil;
import org.eclipse.mylyn.internal.reviews.ui.IReviewActionListener;
import org.eclipse.mylyn.internal.reviews.ui.editors.parts.CommentPart;
@@ -55,7 +56,6 @@ import com.google.common.collect.FluentIterable;
* @author Guy Perron
*/
public class CommentPopupDialog extends PopupDialog implements IReviewActionListener {
-
private static final int MAX_WIDTH = 500;
private static final int MIN_HEIGHT = 70;
@@ -131,6 +131,7 @@ public class CommentPopupDialog extends PopupDialog implements IReviewActionList
composite = toolkit.createComposite(scrolledComposite, SWT.NONE);
composite.setLayout(new GridLayout());
scrolledComposite.setContent(composite);
+ new ShellDragSupport(composite);
return scrolledComposite;
}

Back to the top