From c234091f0c21fe583c9d75bd564f0134754a3c95 Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sun, 17 Feb 2019 13:47:06 +0100 Subject: [PATCH] Fixed swap drag'n'drop mode (Fixed #137) --- .../src/main/java/de/tobias/playpad/project/Project.java | 1 + .../src/main/java/de/tobias/playpad/project/page/Page.java | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java index fb6104fc..508d3d69 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/Project.java @@ -108,6 +108,7 @@ public class Project { } } } + Page page = pages.get(index.getPagePosition()); page.setPad(index.getId(), pad); } diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java index 20c1d326..28e271d7 100644 --- a/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java +++ b/PlayWallCore/src/main/java/de/tobias/playpad/project/page/Page.java @@ -205,9 +205,8 @@ public class Page implements Cloneable { * @param pad pad */ public void setPad(int id, Pad pad) { - if (pad == null) { - pads.removeIf(p -> p.getPosition() == id); - } else { + pads.removeIf(p -> p.getPosition() == id); + if (pad != null) { pads.add(pad); pad.setPage(this); pad.setPosition(id); -- GitLab