From: Reino Ruusu <reino.ruusu@semantum.fi>
Date: Mon, 25 Feb 2019 10:18:57 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/release/1.36.0' into release/1.35.1
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F93%2F2693%2F4;hp=377e9f40e4a6b30f32e3fd15464072e4b7732f6a;p=simantics%2Fdistrict.git

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 b29f1876..7dd55f5e 100644
--- 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 d2c2ed5c..f8a36338 100644
--- 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 8376b38f..720e49f4 100644
--- 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>