summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Canvas.cpp4
-rw-r--r--src/item.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
index a461a6e..01e6296 100644
--- a/src/Canvas.cpp
+++ b/src/Canvas.cpp
@@ -803,6 +803,10 @@ apply_force(GanvNode* a, GanvNode* b, const Vector& f)
gboolean
GanvCanvasImpl::layout_iteration()
{
+ if (_drag_state == EDGE) {
+ return FALSE; // Canvas is locked, halt layout process
+ }
+
static const double T_PER_US = .0001; // Sym time per real microsecond
static uint64_t prev = 0; // Previous iteration time
diff --git a/src/item.c b/src/item.c
index d3f9678..d128de8 100644
--- a/src/item.c
+++ b/src/item.c
@@ -26,10 +26,7 @@
#include "./ganv-private.h"
#include "./gettext.h"
-/**
- * #GanvItem: Base class for all canvas items.
- *
- * All canvas items are derived from GanvItem. The only information a GanvItem
+/* All canvas items are derived from GanvItem. The only information a GanvItem
* contains is its parent canvas, its parent canvas item, its bounding box in
* world coordinates, and its current affine transformation.
*