X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=23185cf3252e6d15418a563395795b2de3caf41d;hb=975ea87cc7be179618b06291cb2506a2523cad1f;hp=279d83b6df952654c38b0abcc2467b4e61656d65;hpb=6ba6af3637c299ab00828c49de9151429488cc17;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 279d83b..23185cf 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -129,12 +129,12 @@ Designer::Designer(int argc, char **argv): toolbar->set_position(0, window.get_height()-toolbar->get_geometry().h); toolbar->set_focusable(false); - GLtk::Panel *statusbar = new GLtk::Panel(ui_res); + GLtk::Panel *statusbar = new GLtk::Panel; root.add(*statusbar); statusbar->set_size(window.get_width(), 20); statusbar->set_focusable(false); - lbl_status = new GLtk::Label(ui_res); + lbl_status = new GLtk::Label; statusbar->add(*lbl_status); lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); @@ -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(); }