]> git.tdb.fi Git - r2c2.git/commitdiff
Ignore the click that causes manipulator to finish
authorMikko Rasa <tdb@tdb.fi>
Mon, 8 Nov 2010 14:28:24 +0000 (14:28 +0000)
committerMikko Rasa <tdb@tdb.fi>
Mon, 8 Nov 2010 14:28:24 +0000 (14:28 +0000)
source/designer/designer.cpp
source/designer/designer.h

index 279d83b6df952654c38b0abcc2467b4e61656d65..d3932338a9edbbc23681f2afd164b7b0e45530ca 100644 (file)
@@ -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();
 }
 
index c82a2541574506d00427376831da949daa487bb5..c173668408a36d1300f8c725a75a9dec18a06a91 100644 (file)
@@ -42,6 +42,7 @@ private:
                SELECT,
                CATALOGUE,
                MANIPULATE,
+               MANIPULATE_DONE,
                MEASURE
        };