If environment variable SYNFIG_TOOLS_CLEAR_SELECTION is set, then unselect all layers...

[synfig.git] / synfig-studio / trunk / src / gtkmm / state_rectangle.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
index 50b542e..4226f59 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp
@@ -49,6 +49,8 @@
 #include "duck.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -128,10 +130,10 @@ public:
        void save_settings();
        void reset();
        void increment_id();
-       bool no_egress_on_selection_change;
+       bool egress_on_selection_change;
        Smach::event_result event_layer_selection_changed_handler(const Smach::event& /*x*/)
        {
-               if(!no_egress_on_selection_change)
+               if(egress_on_selection_change)
                        throw Smach::egress_exception();
                return Smach::RESULT_OK;
        }
@@ -211,7 +213,10 @@ StateRectangle_Context::increment_id()
        if(id[id.size()-1]<='9' && id[id.size()-1]>='0')
        {
                // figure out how many digits it is
-               for(digits=0;(int)id.size()-1>=digits && id[id.size()-1-digits]<='9' && id[id.size()-1-digits]>='0';digits++)while(false);
+               for (digits = 0;
+                        (int)id.size()-1 >= digits && id[id.size()-1-digits] <= '9' && id[id.size()-1-digits] >= '0';
+                        digits++)
+                       ;
 
                String str_number;
                str_number=String(id,id.size()-digits,id.size());
@@ -241,14 +246,14 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view):
        canvas_view_(canvas_view),
        is_working(*canvas_view),
        duckmatic_push(get_work_area()),
-       prev_workarea_layer_status_(get_work_area()->allow_layer_clicks),
+       prev_workarea_layer_status_(get_work_area()->get_allow_layer_clicks()),
        settings(synfigapp::Main::get_selected_input_device()->settings()),
        entry_id(),
        adj_expand(0,0,1,0.01,0.1),
        spin_expand(adj_expand,0.1,3),
        check_invert(_("Invert"))
 {
-       no_egress_on_selection_change=false;
+       egress_on_selection_change=true;
        load_settings();
 
        // Set up the tool options dialog
@@ -269,7 +274,7 @@ StateRectangle_Context::StateRectangle_Context(CanvasView* canvas_view):
        App::dialog_tool_options->present();
 
        // Turn off layer clicking
-       get_work_area()->allow_layer_clicks=false;
+       get_work_area()->set_allow_layer_clicks(false);
 
        // clear out the ducks
        get_work_area()->clear_ducks();
@@ -313,7 +318,7 @@ StateRectangle_Context::~StateRectangle_Context()
        save_settings();
 
        // Restore layer clicking
-       get_work_area()->allow_layer_clicks = prev_workarea_layer_status_;
+       get_work_area()->set_allow_layer_clicks(prev_workarea_layer_status_);
 
        get_canvas_view()->work_area->reset_cursor();
 
@@ -328,6 +333,8 @@ StateRectangle_Context::~StateRectangle_Context()
        // Refresh the work area
        get_work_area()->queue_draw();
 
+       get_canvas_view()->queue_rebuild_ducks();
+
        App::toolbox->refresh();
 }
 
@@ -386,10 +393,14 @@ StateRectangle_Context::make_rectangle(const Point& _p1, const Point& _p2)
        layer->set_description(get_id());
        get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
 
-       no_egress_on_selection_change=true;
+       egress_on_selection_change=false;
+       synfigapp::SelectionManager::LayerList layer_selection;
+       if (!getenv("SYNFIG_TOOLS_CLEAR_SELECTION"))
+               layer_selection = get_canvas_view()->get_selection_manager()->get_selected_layers();
        get_canvas_interface()->get_selection_manager()->clear_selected_layers();
-       get_canvas_interface()->get_selection_manager()->set_selected_layer(layer);
-       no_egress_on_selection_change=false;
+       layer_selection.push_back(layer);
+       get_canvas_interface()->get_selection_manager()->set_selected_layers(layer_selection);
+       egress_on_selection_change=true;
 
        //post clean up stuff...
        reset();