From 8e3009751ee81e0e5312cae53ee844bdd9e49628 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 8 Nov 2010 14:28:24 +0000 Subject: [PATCH] Ignore the click that causes manipulator to finish --- source/designer/designer.cpp | 5 ++++- source/designer/designer.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) 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 }; -- 2.45.2