From: Daniel Kirschten Date: Wed, 17 Jul 2019 09:48:36 +0000 (+0200) Subject: Merge remote-tracking branch 'origin/development' into development X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=f3e1662abcae720f6b1ea396e1ac33c1be41e429;hp=b14ab9cad4ba6540a38da48eb4c54db37010e83e;p=Mograsim.git Merge remote-tracking branch 'origin/development' into development --- diff --git a/SWTHelper b/SWTHelper index db7cb7cb..64cdeb5b 160000 --- a/SWTHelper +++ b/SWTHelper @@ -1 +1 @@ -Subproject commit db7cb7cb9548c5c8dbf3b620cd5b9fa3415bb9a5 +Subproject commit 64cdeb5b8f7ffec96629f3d2e31d969e46058b63 diff --git a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java index 945490cb..e3279150 100644 --- a/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java +++ b/net.mograsim.logic.model.editor/src/net/mograsim/logic/model/editor/Editor.java @@ -192,8 +192,8 @@ public final class Editor case OFF: break; case ABSOLUTE: - newP.x -= newP.x % snapX; - newP.y -= newP.y % snapY; + newP.x = (int) (newP.x / snapX + .5) * snapX; + newP.y = (int) (newP.y / snapY + .5) * snapY; break; default: break;