Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1

Conflicts:
	org.simantics.district.network/src/org/simantics/district/network/profile/DistrictNodeGroup.java

Change-Id: I2780355701d80fc5dc992442209f614136e3c9db

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
index b29f1876fb179948abcd8253fad56fb91c5002b0..7dd55f5e1743ace66ebb402ec46c498ff155dd84 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
@@ -59,7 +59,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
     }
 
     public boolean pickHoveredElement(Point2D currentMousePos) {
-        PickRequest req = new PickRequest(currentMousePos.getX(), currentMousePos.getY());
+        PickRequest req = new PickRequest(currentMousePos.getX(), currentMousePos.getY()).context(getContext());
         List<IElement> pickables = new ArrayList<IElement>();
         pick.pick(diagram, req, pickables);
         

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableDynamicMenuContribution.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableDynamicMenuContribution.java
index d2c2ed5ca799e26ab284c64b6842008d8c77d066..f8a363384b96a427f5a34fa6f21cc52176ad96e1 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableDynamicMenuContribution.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/contributions/SetFocusableDynamicMenuContribution.java
@@ -58,7 +58,7 @@ public class SetFocusableDynamicMenuContribution {
         // Quite hackish solution..
         boolean oldIgnore = le.getIgnoreFocusSettings();
         le.setIgnoreFocusSettings(true);
-        pick.pick(diagram, new PickRequest(canvasPosition.getX(), canvasPosition.getY()), result);
+        pick.pick(diagram, new PickRequest(canvasPosition.getX(), canvasPosition.getY()).context(ctx), result);
         le.setIgnoreFocusSettings(oldIgnore);
         
         boolean allow = false;

diff --git a/pom.xml b/pom.xml
index 8376b38f5f2759e73f5e731d57b778d2a7b022f7..720e49f4011fd83e48041701c6728f7f52b1d13c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
        <!-- common settings for all modules -->
        <properties>
-               <branch-spec>release/1.35.0</branch-spec>
+               <branch-spec>release/1.35.1</branch-spec>
                <simantics-download-site>http://www.simantics.org/download</simantics-download-site>
                <tycho-version>1.0.0</tycho-version>
        </properties>