summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-01-11 23:40:26 +0000
committerDavid Robillard <d@drobilla.net>2014-01-11 23:40:26 +0000
commit14905ea58cc45c450c517e354b6c3de90f5f249b (patch)
tree15572e74cff43c69398036af3a5aa6f63b4d54bc
parent2c07b0df01c7b8ca9e9d5ea1730b09ca3cf801de (diff)
downloadganv-14905ea58cc45c450c517e354b6c3de90f5f249b.tar.gz
ganv-14905ea58cc45c450c517e354b6c3de90f5f249b.tar.bz2
ganv-14905ea58cc45c450c517e354b6c3de90f5f249b.zip
Stop layout while connect dragging.
git-svn-id: http://svn.drobilla.net/lad/trunk/ganv@5304 a436a847-0d15-0410-975c-d299462d15a1
-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.
*