projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
state_smoothmove.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
index
edd51ff
..
a29f6f1
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file state_smooth
_
move.cpp
+/*! \file state_smoothmove.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: state_smoothmove.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-183,7
+183,7
@@
StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view):
//App::dialog_tool_options->set_widget(options_table);
App::dialog_tool_options->present();
//App::dialog_tool_options->set_widget(options_table);
App::dialog_tool_options->present();
- get_work_area()->
allow_layer_clicks=true
;
+ get_work_area()->
set_allow_layer_clicks(true)
;
get_work_area()->set_duck_dragger(duck_dragger_);
App::toolbox->refresh();
get_work_area()->set_duck_dragger(duck_dragger_);
App::toolbox->refresh();
@@
-204,7
+204,7
@@
StateSmoothMove_Context::refresh_tool_options()
}
Smach::event_result
}
Smach::event_result
-StateSmoothMove_Context::event_refresh_tool_options(const Smach::event&
x
)
+StateSmoothMove_Context::event_refresh_tool_options(const Smach::event&
/*x*/
)
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
{
refresh_tool_options();
return Smach::RESULT_ACCEPT;
@@
-260,9
+260,13
@@
DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vecto
int i;
int i;
+ // process vertex and position ducks first
for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
{
for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
{
- if(((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue;
+ // skip this duck if it is NOT a vertex or a position
+ if (((*iter)->get_type() != Duck::TYPE_VERTEX &&
+ (*iter)->get_type() != Duck::TYPE_POSITION))
+ continue;
Point p(positions[i]);
float dist(1.0f-(p-drag_offset_).mag()/get_radius());
Point p(positions[i]);
float dist(1.0f-(p-drag_offset_).mag()/get_radius());
@@
-273,9
+277,13
@@
DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vecto
(*iter)->set_trans_point(p+last_[i]);
}
(*iter)->set_trans_point(p+last_[i]);
}
+ // then process non vertex and non position ducks
for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
{
for(i=0,iter=selected_ducks.begin();iter!=selected_ducks.end();++iter,i++)
{
- if(!((*iter)->get_type()!=Duck::TYPE_VERTEX&&(*iter)->get_type()!=Duck::TYPE_POSITION))continue;
+ // skip this duck if it IS a vertex or a position
+ if (!((*iter)->get_type() != Duck::TYPE_VERTEX &&
+ (*iter)->get_type() != Duck::TYPE_POSITION))
+ continue;
Point p(positions[i]);
float dist(1.0f-(p-drag_offset_).mag()/get_radius());
Point p(positions[i]);
float dist(1.0f-(p-drag_offset_).mag()/get_radius());