Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaurent Redor2018-01-12 16:19:52 +0000
committerLaurent Redor2018-01-12 16:21:08 +0000
commit775070bf73bbd2e0d837ca8da88fd587d770fe61 (patch)
tree8fb5af588262f34f4dc92e77aece9450803d4015
parent28af4597e801a15047fdebf559e2a2e0bbc2b604 (diff)
downloadorg.eclipse.sirius-775070bf73bbd2e0d837ca8da88fd587d770fe61.tar.gz
org.eclipse.sirius-775070bf73bbd2e0d837ca8da88fd587d770fe61.tar.xz
org.eclipse.sirius-775070bf73bbd2e0d837ca8da88fd587d770fe61.zip
[529741] Fix pb for selection from top right to bottom leftv5.1.1rc4
The previous commit for 529536 does not completly fix the problem detected by Jessy, comment 4 on bugzilla 529536 [1]. It introduces a regression fixed by this new commit. [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=529536#c4 Bug: 529741 Change-Id: I6e061ff6e48940f8f89c6c05c951cb33ca931483 Signed-off-by: Laurent Redor <laurent.redor@obeo.fr>
-rw-r--r--plugins/org.eclipse.sirius.ext.gmf.runtime/src/org/eclipse/sirius/ext/gmf/runtime/diagram/ui/tools/RubberbandSelectionTool.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.sirius.ext.gmf.runtime/src/org/eclipse/sirius/ext/gmf/runtime/diagram/ui/tools/RubberbandSelectionTool.java b/plugins/org.eclipse.sirius.ext.gmf.runtime/src/org/eclipse/sirius/ext/gmf/runtime/diagram/ui/tools/RubberbandSelectionTool.java
index eced098e4f..caa8bff52a 100644
--- a/plugins/org.eclipse.sirius.ext.gmf.runtime/src/org/eclipse/sirius/ext/gmf/runtime/diagram/ui/tools/RubberbandSelectionTool.java
+++ b/plugins/org.eclipse.sirius.ext.gmf.runtime/src/org/eclipse/sirius/ext/gmf/runtime/diagram/ui/tools/RubberbandSelectionTool.java
@@ -165,7 +165,7 @@ public class RubberbandSelectionTool extends AbstractTool {
getMarqueeFeedbackFigure().translateToRelative(r);
if ((selectionMode == SELECTION_CONTAINED_MODE && marqueeBounds.contains(r.getTopLeft()) && marqueeBounds.contains(r.getBottomRight()))
|| (selectionMode == SELECTION_TOUCHED_MODE && ((child instanceof ConnectionEditPart && pl.intersects(marqueeBounds)) || (!(child instanceof ConnectionEditPart) && marqueeBounds
- .intersects(r) && !r.contains(marqueeBounds.getBottomRight()))))) {
+ .intersects(r) && !r.contains(feedBackStartLocation))))) {
newSelections.add(child);
}
}

Back to the top