From: Mikko Rasa <tdb@tdb.fi>
Date: Mon, 8 Nov 2010 14:28:24 +0000 (+0000)
Subject: Ignore the click that causes manipulator to finish
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=8e3009751ee81e0e5312cae53ee844bdd9e49628;p=r2c2.git

Ignore the click that causes manipulator to finish
---

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index 279d83b..d393233 100644
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -271,6 +271,9 @@ void Designer::tick()
 	float dt = (t-last_tick)/Msp::Time::sec;
 	last_tick = t;
 
+	if(mode==MANIPULATE_DONE)
+		mode = SELECT;
+
 	window.tick();
 	root.tick();
 	camera_ctl.tick(dt);
@@ -558,7 +561,7 @@ void Designer::manipulation_status(const string &status)
 
 void Designer::manipulation_done(bool)
 {
-	mode = SELECT;
+	mode = MANIPULATE_DONE;
 	selection_changed();
 }
 
diff --git a/source/designer/designer.h b/source/designer/designer.h
index c82a254..c173668 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -42,6 +42,7 @@ private:
 		SELECT,
 		CATALOGUE,
 		MANIPULATE,
+		MANIPULATE_DONE,
 		MEASURE
 	};