From 0aae57089fe5a46a519533aabecc1bbab64694fa Mon Sep 17 00:00:00 2001
From: Jussi Koskela <jussi.koskela@semantum.fi>
Date: Thu, 2 Apr 2020 13:55:21 +0300
Subject: [PATCH] Fixed moving elements up/down on diagram

gitlab #509

Change-Id: I47ab51cb5ff07499ed0637e9f7012ec16c5ae7a7
(cherry picked from commit 06ba87c8c0f66b8d198eaad24a98442a9d3bc581)
---
 .../org/simantics/g2d/diagram/participant/ZOrderHandler.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
index 007d039f2..8b893a2b1 100644
--- a/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
+++ b/bundles/org.simantics.g2d/src/org/simantics/g2d/diagram/participant/ZOrderHandler.java
@@ -86,8 +86,8 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
                         int index = elements.indexOf(e);
                         if (index != -1 && selectedElements.contains(e)) {
                             changed |= diagram.moveTo(e, nextPos);
-                            nextPos = index;
                         }
+                        nextPos = index;
                     }
                     if (changed) {
                         notifyZOrderListeners(diagram);
@@ -121,8 +121,8 @@ public class ZOrderHandler extends AbstractDiagramParticipant {
                         int index = elements.indexOf(e);
                         if (index != -1 && selectedElements.contains(e)) {
                             changed |= diagram.moveTo(e, nextPos);
-                            nextPos = index;
                         }
+                        nextPos = index;
                     }
                     if (changed) {
                         notifyZOrderListeners(diagram);
-- 
2.47.1