Rename all 'pos' parameters to 'origin'.

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
index 2114d4c..b83431b 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@ -399,8 +399,8 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view):
 {
        egress_on_selection_change=true;
        // Set up the tool options dialog
-       //options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
-       options_table.attach(entry_id, 0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+       options_table.attach(*manage(new Gtk::Label(_("Circle Tool"))), 0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+       options_table.attach(entry_id,                                                                  0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
 
        enum_falloff.set_param_desc(ParamDesc("falloff")
                .set_local_name(_("Falloff"))
@@ -594,8 +594,8 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
                layer=get_canvas_interface()->add_layer_to("circle",canvas,depth);
                layer_selection.push_back(layer);
 
-               layer->set_param("pos",p1);
-               get_canvas_interface()->signal_layer_param_changed()(layer,"pos");
+               layer->set_param("origin",p1);
+               get_canvas_interface()->signal_layer_param_changed()(layer,"origin");
 
                layer->set_param("radius",(p2-p1).mag());
                get_canvas_interface()->signal_layer_param_changed()(layer,"radius");
@@ -616,6 +616,12 @@ StateCircle_Context::make_circle(const Point& _p1, const Point& _p2)
 
                layer->set_description(get_id());
                get_canvas_interface()->signal_layer_new_description()(layer,layer->get_description());
+
+               if(get_layer_outline_flag())
+               {
+                       layer->set_param("color",synfigapp::Main::get_background_color());
+                       get_canvas_interface()->signal_layer_param_changed()(layer,"color");
+               }
        }
 
        ///////////////////////////////////////////////////////////////////////////