using namespace synfig;
using namespace studio;
+
/* === M A C R O S ========================================================= */
/* === G L O B A L S ======================================================= */
editable_(true),
adj_default(0,0,2,1/24,10/24),
adj_timescale(0),
- fps(24)
+ fps(24),
+ kf_list_(&default_kf_list_),
+ time_ratio("4f", fps)
{
set_size_request(-1,64);
//!This signal is called when the widget need to be redrawn
//! left button motion
add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
add_events(Gdk::BUTTON1_MOTION_MASK);
+ add_events(Gdk::POINTER_MOTION_MASK);
set_time_adjustment(&adj_default);
-
+ queue_draw();
}
Widget_Keyframe_List::~Widget_Keyframe_List()
bool
Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
{
+
const int h(get_height());
const int w(get_width());
//! A rectangle that defines the drawing area.
Gdk::Rectangle area(0,0,w,h);
+ //! draw a background
+ gc->set_rgb_fg_color(Gdk::Color("#9d9d9d"));
+ get_window()->draw_rectangle(gc, true, 0, 0, w, h);
+
if(!editable_)
{
- return true;
+ return true; //needs fixing!
}
-
- //! draw a background
- gc->set_rgb_fg_color(Gdk::Color("#7f7f7f"));
- get_window()->draw_rectangle(gc, false, 0, 0, w, h);
+ //!Returns if there are not keyframes to draw.
+ if (kf_list_->empty()) return false;
//!Loop all the keyframes
synfig::KeyframeList::iterator iter,selected_iter;
bool show_selected(false);
- for(iter=kf_list_.begin();iter!=kf_list_.end();iter++)
+ for(iter=kf_list_->begin();iter!=kf_list_->end();iter++)
{
//!do not draw keyframes out of the widget boundaries
if (iter->get_time()>top || iter->get_time()<bottom)
const int x((int)((float)(iter->get_time()-bottom) * (w/(top-bottom)) ) );
get_style()->paint_arrow(get_window(), Gtk::STATE_NORMAL,
Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1,
- x-h/2, 0, h, h );
+ x-h/2+1, 0, h, h );
}
else
{
// the selected keyframe is shown on top
if(show_selected)
{
- const int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) );
+ // If not dragging just show the selected keyframe
+ if (!dragging_)
+ {
+ int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) );
get_style()->paint_arrow(get_window(), Gtk::STATE_SELECTED,
Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1,
+ x-h/2+1, 0, h, h );
+ }
+ // If dragging then show the selected as insensitive and the
+ // dragged as selected
+ else
+ {
+ int x((int)((float)(selected_iter->get_time()-bottom) * (w/(top-bottom)) ) );
+ get_style()->paint_arrow(get_window(), Gtk::STATE_INSENSITIVE,
+ Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1,
x-h/2, 0, h, h );
+ x=(int)((float)(dragging_kf_time-bottom) * (w/(top-bottom)) ) ;
+ get_style()->paint_arrow(get_window(), Gtk::STATE_SELECTED,
+ Gtk::SHADOW_OUT, area, *this, " ", Gtk::ARROW_DOWN, 1,
+ x-h/2+1, 0, h, h );
+ }
}
-
return true;
}
void
-Widget_Keyframe_List::set_kf_list(const synfig::KeyframeList& x)
+Widget_Keyframe_List::set_kf_list(synfig::KeyframeList* x)
{
kf_list_=x;
- if(kf_list_.size())
- set_selected_keyframe(*kf_list_.find_next(synfig::Time::zero()));
+ set_selected_keyframe(selected_none);
+ selected_=false;
+ dragging_=false;
}
void
Widget_Keyframe_List::set_selected_keyframe(const synfig::Keyframe &x)
{
selected_kf=x;
+ selected_=true;
+ dragging_kf_time=selected_kf.get_time();
//signal_keyframe_selected_(selected_kf);
+ dragging_=false;
queue_draw();
}
bool
Widget_Keyframe_List::perform_move_kf()
{
- return false;
+ if(!selected_)
+ return false;
+ if(dragging_kf_time == selected_kf.get_time())
+ return false;
+ synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSet"));
+ if(!action)
+ return false;
+ selected_kf.set_time(dragging_kf_time);
+ action->set_param("canvas",canvas_interface_->get_canvas());
+ action->set_param("canvas_interface",canvas_interface_);
+ action->set_param("keyframe",selected_kf);
+ try
+ {
+ canvas_interface_->get_instance()->perform_action(action);
+ }
+ catch(...)
+ {
+ return false;
+ }
+ queue_draw();
+ return true;
}
bool
{
const int x(static_cast<int>(event->button.x));
const int y(static_cast<int>(event->button.y));
- //!Boundaries of the drawing area in time units.
+ //!Boundaries of the drawing area in time units.
synfig::Time top(adj_timescale->get_upper());
synfig::Time bottom(adj_timescale->get_lower());
- //!pos is the [0,1] relative horizontal place on the widget
- float pos((float)x/(float)get_width());
+ //!pos is the [0,1] relative horizontal place on the widget
+ float pos((float)x/(get_width()));
if(pos<0.0f)pos=0.0f;
if(pos>1.0f)pos=1.0f;
- //! The time where the event x is
- synfig::Time t((float)(pos*(top-bottom)));
- //! here the guts of the event
+ //! The time where the event x is
+ synfig::Time t((float)(bottom+pos*(top-bottom)));
+ //Do not respond mouse events if the list is empty
+ if(!kf_list_->size())
+ return true;
+
+ //! here the guts of the event
switch(event->type)
{
case GDK_MOTION_NOTIFY:
if(editable_)
{
- if(!kf_list_.size()) return true;
- // stick to integer frames.
- if(fps)
+ // here is captured mouse motion
+ // AND left mouse button pressed
+ if (event->motion.state & GDK_BUTTON1_MASK)
+ {
+ // stick to integer frames. It can be optional in the future
+ if(fps) t = floor(t*fps + 0.5)/fps;
+ dragging_kf_time=t;
+ dragging_=true;
+ queue_draw();
+ return true;
+ }
+ // here is captured mouse motion
+ // AND NOT left mouse button pressed
+ else
+ {
+ synfig::Time p_t,n_t;
+ kf_list_->find_prev_next(t, p_t, n_t);
+ if( (p_t==Time::begin() && n_t==Time::end())
+ ||
+ ((t-p_t)>time_ratio && (n_t-t)>time_ratio)
+ )
+ {
+ Glib::ustring ttip = _("Click and drag keyframes");
+ set_tooltip_text(ttip);
+ }
+ else if ((t-p_t)<(n_t-t))
{
- t = floor(t*fps + 0.5)/fps;
+ synfig::Keyframe kf(*kf_list_->find_prev(t));
+ synfig::String kf_name(kf.get_description().c_str());
+ Glib::ustring ttip = kf_name.c_str();
+ set_tooltip_text(ttip);
}
- dragging_kf_time=t;
- queue_draw();
- return true;
+ else
+ {
+ synfig::Keyframe kf(*kf_list_->find_next(t));
+ synfig::String kf_name(kf.get_description().c_str());
+ Glib::ustring ttip = kf_name.c_str();
+ set_tooltip_text(ttip);
+ }
+ dragging_=false;
+ queue_draw();
+ return true;
+ }
}
break;
case GDK_BUTTON_PRESS:
changed_=false;
+ dragging_=false;
if(event->button.button==1)
{
if(editable_)
{
- synfig::KeyframeList::iterator selected;
- selected = kf_list_.find_next(t);
- set_selected_keyframe(*selected);
- queue_draw();
- return true;
+ synfig::Time prev_t,next_t;
+ kf_list_->find_prev_next(t, prev_t, next_t);
+ if( (prev_t==Time::begin() && next_t==Time::end())
+ ||
+ ((t-prev_t)>time_ratio && (next_t-t)>time_ratio)
+ )
+ {
+ set_selected_keyframe(selected_none);
+ selected_=false;
+ queue_draw();
+ return true;
+ }
+ else if ((t-prev_t)<(next_t-t))
+ {
+ set_selected_keyframe(*(kf_list_->find_prev(t)));
+ queue_draw();
+ selected_=true;
+ return true;
+ }
+ else
+ {
+ set_selected_keyframe(*(kf_list_->find_next(t)));
+ queue_draw();
+ selected_=true;
+ return true;
+ }
+ return false;
}
else
{
- return true;
+ return false;
}
}
break;
case GDK_BUTTON_RELEASE:
if(editable_ && event->button.button==1)
{
- // stick to integer frames.
- if(fps)
- {
- t = floor(t*fps + 0.5)/fps;
- }
- bool stat=perform_move_kf();
- synfig::info("Dropping keyframe at: %s", t.get_string().c_str());
- return stat;
+ // stick to integer frames.
+ if(fps) t = floor(t*fps + 0.5)/fps;
+ bool stat=false;
+ if(dragging_)
+ stat=perform_move_kf();
+ dragging_=false;
+ return stat;
}
+ break;
default:
break;
}
-
-
return false;
}
queue_draw();
}
}
+
+void
+Widget_Keyframe_List::set_canvas_interface(etl::loose_handle<synfigapp::CanvasInterface> h)
+{
+ canvas_interface_=h;
+ // Store the values used fomr the canvas interface.
+ if (canvas_interface_)
+ {
+ set_fps(canvas_interface_->get_canvas()->rend_desc().get_frame_rate());
+ set_kf_list(&canvas_interface_->get_canvas()->keyframe_list());
+ }
+}
+
+
projects / synfig.git / blobdiff