Added copyright lines for files I've edited this year.

[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 d58a71b..fb06cd5 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp
@@ -6,6 +6,7 @@
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2008 Chris Moore
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -50,6 +51,8 @@
 #include "widget_enum.h"
 #include <synfigapp/main.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -147,10 +150,10 @@ public:
        void save_settings();
        void reset();
        void increment_id();
-       bool no_egress_on_selection_change;
-       Smach::event_result event_layer_selection_changed_handler(const Smach::event& x)
+       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;
        }
@@ -242,7 +245,10 @@ StateCircle_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());
@@ -272,14 +278,14 @@ StateCircle_Context::StateCircle_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_feather(0,0,1,0.01,0.1),
        spin_feather(adj_feather,0.1,3),
        check_invert(_("Invert"))
 {
-       no_egress_on_selection_change=false;
+       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);
@@ -315,7 +321,7 @@ StateCircle_Context::StateCircle_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();
@@ -327,8 +333,8 @@ StateCircle_Context::StateCircle_Context(CanvasView* canvas_view):
        //prev_table_status=get_canvas_view()->tables_are_visible();
        //if(prev_table_status)get_canvas_view()->hide_tables();
 
-       // Hide the time bar
-       //get_canvas_view()->hide_timebar();
+       // Disable the time bar
+       //get_canvas_view()->set_sensitive_timebar(false);
 
        // Connect a signal
        //get_work_area()->signal_user_click().connect(sigc::mem_fun(*this,&studio::StateCircle_Context::on_user_click));
@@ -347,7 +353,7 @@ StateCircle_Context::refresh_tool_options()
 }
 
 Smach::event_result
-StateCircle_Context::event_refresh_tool_options(const Smach::event& x)
+StateCircle_Context::event_refresh_tool_options(const Smach::event& /*x*/)
 {
        refresh_tool_options();
        return Smach::RESULT_ACCEPT;
@@ -358,14 +364,13 @@ StateCircle_Context::~StateCircle_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();
 
        App::dialog_tool_options->clear();
 
-       // Show the time bar
-       if(get_canvas_view()->get_canvas()->rend_desc().get_time_start()!=get_canvas_view()->get_canvas()->rend_desc().get_time_end())
-               get_canvas_view()->show_timebar();
+       // Enable the time bar
+       //get_canvas_view()->set_sensitive_timebar(true);
 
        // Bring back the tables if they were out before
        //if(prev_table_status)get_canvas_view()->show_tables();
@@ -377,13 +382,13 @@ StateCircle_Context::~StateCircle_Context()
 }
 
 Smach::event_result
-StateCircle_Context::event_stop_handler(const Smach::event& x)
+StateCircle_Context::event_stop_handler(const Smach::event& /*x*/)
 {
        throw Smach::egress_exception();
 }
 
 Smach::event_result
-StateCircle_Context::event_refresh_handler(const Smach::event& x)
+StateCircle_Context::event_refresh_handler(const Smach::event& /*x*/)
 {
        refresh_ducks();
        return Smach::RESULT_ACCEPT;
@@ -438,10 +443,10 @@ 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());
 
-               no_egress_on_selection_change=true;
+               egress_on_selection_change=false;
                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;
+               egress_on_selection_change=true;
        }
 
        reset();
@@ -470,6 +475,7 @@ StateCircle_Context::event_mouse_click_handler(const Smach::event& x)
                point2_duck->set_radius(true);
                point2_duck->set_scalar(-1);
                point2_duck->set_type(Duck::TYPE_RADIUS);
+               point2_duck->set_hover(true);
                get_work_area()->add_duck(point2_duck);
 
                return Smach::RESULT_ACCEPT;
@@ -484,7 +490,15 @@ StateCircle_Context::event_mouse_click_handler(const Smach::event& x)
 
        if(event.key==EVENT_WORKAREA_MOUSE_BUTTON_UP && event.button==BUTTON_LEFT)
        {
-               make_circle(point_holder, get_work_area()->snap_point_to_grid(event.pos));
+               Point point(get_work_area()->snap_point_to_grid(event.pos));
+
+               if (App::restrict_radius_ducks)
+               {
+                       if ((point[0] - point_holder[0]) * get_work_area()->get_pw() < 0) point[0] = point_holder[0];
+                       if ((point[1] - point_holder[1]) * get_work_area()->get_ph() > 0) point[1] = point_holder[1];
+               }
+
+               make_circle(point_holder, point);
                get_work_area()->clear_ducks();
                return Smach::RESULT_ACCEPT;
        }