Author: Nikita Kitaev <[email protected]>
Date: Sat Mar 19 21:55:31 2011 -0700
Show visual feedback even when mouse is not pressed
---
synfig-studio/src/gui/states/state_smoothmove.cpp | 64 ++++++++++----------
1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/synfig-studio/src/gui/states/state_smoothmove.cpp
b/synfig-studio/src/gui/states/state_smoothmove.cpp
index 5a974be..4b502bb 100644
--- a/synfig-studio/src/gui/states/state_smoothmove.cpp
+++ b/synfig-studio/src/gui/states/state_smoothmove.cpp
@@ -85,10 +85,6 @@ class DuckDrag_SmoothMove : public DuckDrag_Base
std::vector<synfig::Vector> last_;
std::vector<synfig::Vector> positions;
- etl::handle<Duck> center_duck;
- etl::handle<Duck> radius_duck;
- etl::handle<Duck> closestpoint_duck;
-
public:
DuckDrag_SmoothMove();
void begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& begin);
@@ -118,6 +114,9 @@ class studio::StateSmoothMove_Context : public
sigc::trackable
float pressure;
+ etl::handle<Duck> center_duck;
+ etl::handle<Duck> radius_duck;
+
public:
float get_radius()const { return adj_radius.get_value(); }
void set_radius(float x) { return adj_radius.set_value(x); }
@@ -128,6 +127,8 @@ public:
Smach::event_result event_refresh_tool_options(const Smach::event& x);
+ Smach::event_result event_mouse_motion(const Smach::event& x);
+
void refresh_tool_options();
StateSmoothMove_Context(CanvasView* canvas_view);
@@ -150,6 +151,7 @@ StateSmoothMove::StateSmoothMove():
{
insert(event_def(EVENT_REFRESH_TOOL_OPTIONS,&StateSmoothMove_Context::event_refresh_tool_options));
insert(event_def(EVENT_STOP,&StateSmoothMove_Context::event_stop_handler));
+
insert(event_def(EVENT_WORKAREA_MOUSE_MOTION,&StateSmoothMove_Context::event_mouse_motion));
}
StateSmoothMove::~StateSmoothMove()
@@ -196,7 +198,9 @@
StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view):
settings(synfigapp::Main::get_selected_input_device()->settings()),
duck_dragger_(new DuckDrag_SmoothMove()),
adj_radius(1,0,100000,0.01,0.1),
- spin_radius(adj_radius,0.1,3)
+ spin_radius(adj_radius,0.1,3),
+ center_duck(new Duck()),
+ radius_duck(new Duck())
{
pressure=1.0f;
@@ -220,6 +224,18 @@
StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view):
get_work_area()->set_cursor(Gdk::FLEUR);
//get_work_area()->reset_cursor();
+ center_duck->set_name("p1");
+ center_duck->set_type(Duck::TYPE_POSITION);
+
+ radius_duck->set_origin(center_duck);
+ radius_duck->set_radius(true);
+ radius_duck->set_type(Duck::TYPE_RADIUS);
+ radius_duck->set_name("radius");
+ radius_duck->set_point(Point(1.0,0.0));
+
+ get_work_area()->add_duck(center_duck);
+ get_work_area()->add_duck(radius_duck);
+
load_settings();
}
@@ -245,11 +261,21 @@ StateSmoothMove_Context::event_stop_handler(const
Smach::event& /*x*/)
throw &state_normal;
return Smach::RESULT_OK;
}
+Smach::event_result
+StateSmoothMove_Context::event_mouse_motion(const Smach::event& x)
+{
+ const EventMouse& event(*reinterpret_cast<const EventMouse*>(&x));
+ center_duck->set_point(event.pos);
+ return Smach::RESULT_OK;
+}
StateSmoothMove_Context::~StateSmoothMove_Context()
{
save_settings();
+ get_work_area()->erase_duck(center_duck);
+ get_work_area()->erase_duck(radius_duck);
+
get_work_area()->clear_duck_dragger();
get_work_area()->reset_cursor();
@@ -261,33 +287,13 @@ StateSmoothMove_Context::~StateSmoothMove_Context()
-DuckDrag_SmoothMove::DuckDrag_SmoothMove():
- radius(1.0f),
- center_duck(new Duck()),
- radius_duck(new Duck()),
- closestpoint_duck(new Duck())
+DuckDrag_SmoothMove::DuckDrag_SmoothMove():radius(1.0f)
{
- center_duck->set_name("p1");
- center_duck->set_type(Duck::TYPE_POSITION);
-
- radius_duck->set_origin(center_duck);
- radius_duck->set_radius(true);
- radius_duck->set_type(Duck::TYPE_RADIUS);
- radius_duck->set_name("radius");
- radius_duck->set_point(Point(1.0,0.0));
-
- closestpoint_duck->set_name("closest");
- closestpoint_duck->set_type(Duck::TYPE_POSITION);
}
void
DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const
synfig::Vector& offset)
{
- duckmatic->add_duck(center_duck);
- duckmatic->add_duck(radius_duck);
- duckmatic->add_duck(closestpoint_duck);
- radius_duck->set_point(Point(radius,0.0));
-
last_translate_=Vector(0,0);
drag_offset_=duckmatic->find_duck(offset)->get_trans_point();
@@ -314,8 +320,6 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const
synfig::Vector& vecto
DuckList::const_iterator iter;
synfig::Vector
vect(duckmatic->snap_point_to_grid(vector)-drag_offset_+snap);
- center_duck->set_point(vect+drag_offset_);
-
int i;
Time time(duckmatic->get_time());
@@ -364,10 +368,6 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const
synfig::Vector& vecto
bool
DuckDrag_SmoothMove::end_duck_drag(Duckmatic* duckmatic)
{
- duckmatic->erase_duck(center_duck);
- duckmatic->erase_duck(radius_duck);
- duckmatic->erase_duck(closestpoint_duck);
-
//synfig::info("end_duck_drag(): Diff= %f",last_translate_.mag());
if(last_translate_.mag()>0.0001)
{
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl