X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_keyframe_list.cpp;h=ace2b98b4a925dc14c1afea5045587524998fa39;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=835f814133ec877ca4b4804fd6d0a5bb884fd838;hpb=dd3f7a1496c6ac179f17ca1d940cc4310333891e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
index 835f814..ace2b98 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_keyframe_list.cpp
@@ -48,8 +48,9 @@ using namespace etl;
 using namespace synfig;
 using namespace studio;
 
-/* === M A C R O S ========================================================= */
 
+/* === M A C R O S ========================================================= */
+#define WIDGET_KEYFRAME_LIST_DEFAULT_FPS 24.0
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -57,21 +58,23 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Widget_Keyframe_List::Widget_Keyframe_List():
-	editable_(true),
-	adj_default(0,0,2,1/24,10/24),
-	adj_timescale(0),
-	fps(24),
-	kf_list_(&default_kf_list_)
+	adj_default(0,0,2,1/WIDGET_KEYFRAME_LIST_DEFAULT_FPS,10/WIDGET_KEYFRAME_LIST_DEFAULT_FPS),
+	kf_list_(&default_kf_list_),
+	time_ratio("4f", WIDGET_KEYFRAME_LIST_DEFAULT_FPS)
 {
+	adj_timescale=0;
+	editable_=true;
+	fps=WIDGET_KEYFRAME_LIST_DEFAULT_FPS;
 	set_size_request(-1,64);
 	//!This signal is called when the widget need to be redrawn
 	signal_expose_event().connect(sigc::mem_fun(*this, &studio::Widget_Keyframe_List::redraw));
 	//! The widget respond to mouse button press and release and to
 	//! left button motion
 	add_events(Gdk::BUTTON_PRESS_MASK | Gdk::BUTTON_RELEASE_MASK);
-	add_events(Gdk::BUTTON1_MOTION_MASK);
+	add_events(Gdk::BUTTON1_MOTION_MASK /*| Gdk::BUTTON3_MOTION_MASK*/);
+	add_events(Gdk::POINTER_MOTION_MASK);
 	set_time_adjustment(&adj_default);
-
+	queue_draw();
 }
 
 Widget_Keyframe_List::~Widget_Keyframe_List()
@@ -81,7 +84,7 @@ Widget_Keyframe_List::~Widget_Keyframe_List()
 bool
 Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 {
-	if (kf_list_->empty()) return false;
+
 	const int h(get_height());
 	const int w(get_width());
 
@@ -94,14 +97,16 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 	//! 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("#FF0000"));
-	get_window()->draw_rectangle(gc, true, 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;
@@ -117,7 +122,7 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 			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
 		{
@@ -130,12 +135,28 @@ Widget_Keyframe_List::redraw(GdkEventExpose */*bleh*/)
 	// 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;
 }
 
@@ -144,45 +165,105 @@ void
 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()
+Widget_Keyframe_List::perform_move_kf(bool delta=false)
 {
-	return false;
+	if(!selected_)
+		return false;
+	if(dragging_kf_time == selected_kf.get_time())
+		return false; // change this checking if not sticked to integer frames
+	Time selected_kf_time(selected_kf.get_time());
+	Time prev, next;
+	kf_list_->find_prev_next(selected_kf_time, prev, next);
+	// Not possible to set delta to the first keyframe
+	// perform normal movement
+	// As suggested by Zelgadis it is better to not perform anything.
+	if (prev==Time::begin() && delta==true)
+	{
+		synfig::info(_("Not possible to ALT-drag the first keyframe"));
+		return false;
+	}
+	if(!delta)
+		{
+			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;
+			}
+		}
+	else
+		{
+			Keyframe prev_kf(*kf_list_->find_prev(selected_kf_time));
+			Time prev_kf_time(prev_kf.get_time());
+			if (prev_kf_time >= dragging_kf_time) //Not allowed
+			{
+				synfig::warning(_("Delta set not allowed"));
+				synfig::info(_("Widget_Keyframe_List::perform_move_kf(%i)::prev_kf_time=%s"), delta, prev_kf_time.get_string().c_str());
+				synfig::info(_("Widget_Keyframe_List::perform_move_kf(%i)::dragging_kf_time=%s"), delta, dragging_kf_time.get_string().c_str());
+				return false;
+			}
+			else
+			{
+				Time old_delta_time(selected_kf_time-prev_kf_time);
+				Time new_delta_time(dragging_kf_time-prev_kf_time);
+				Time change_delta(new_delta_time-old_delta_time);
+				synfigapp::Action::Handle action(synfigapp::Action::create("KeyframeSetDelta"));
+				if(!action)
+					return false;
+				action->set_param("canvas",canvas_interface_->get_canvas());
+				action->set_param("canvas_interface",canvas_interface_);
+				action->set_param("keyframe",prev_kf);
+				action->set_param("delta",change_delta);
+				canvas_interface_->get_instance()->perform_action(action);
+			}
+		}
+	queue_draw();
+	return true;
 }
 
 bool
 Widget_Keyframe_List::on_event(GdkEvent *event)
 {
 	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.
+	//const int y(static_cast<int>(event->button.y));
+	//!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)));
-
+	//! 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())
-	{
-		synfig::info("Keyframe list empty");
 		return true;
-	}
 
 	//! here the guts of the event
 	switch(event->type)
@@ -190,54 +271,114 @@ Widget_Keyframe_List::on_event(GdkEvent *event)
 	case GDK_MOTION_NOTIFY:
 		if(editable_)
 		{
-
-			// stick to integer frames.
-			if(fps)
+			// here is captured mouse motion
+			// AND left or right mouse button pressed
+			if (event->motion.state & (GDK_BUTTON1_MASK /*| GDK_BUTTON3_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 or right mouse button pressed
+			else
+			{
+				Glib::ustring ttip="";
+				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)
+				)
 				{
-					t = floor(t*fps + 0.5)/fps;
+					ttip = _("Click and drag keyframes");
 				}
-			dragging_kf_time=t;
-			queue_draw();
-			return true;
+				else if ((t-p_t)<(n_t-t))
+				{
+					synfig::Keyframe kf(*kf_list_->find_prev(t));
+					synfig::String kf_name(kf.get_description().c_str());
+					ttip = kf_name.c_str();
+				}
+				else
+				{
+					synfig::Keyframe kf(*kf_list_->find_next(t));
+					synfig::String kf_name(kf.get_description().c_str());
+					ttip = kf_name.c_str();
+				}
+				tooltips.set_tip(*this, ttip);
+				dragging_=false;
+				queue_draw();
+				return true;
+			}
 		}
 		break;
 	case GDK_BUTTON_PRESS:
 		changed_=false;
-		if(event->button.button==1)
+		dragging_=false;
+		if(event->button.button==1 /*|| event->button.button==3*/)
 		{
-			synfig::info("Looking keyframe at  %s", t.get_string().c_str());
-			synfig::info("Total amount of keyframes %i", kf_list_->size());
 			if(editable_)
 			{
-				synfig::KeyframeList::iterator selected;
-				selected = kf_list_->find_next(t);
-				set_selected_keyframe(*selected);
-				queue_draw();
+				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();
+				}
+				else if ((t-prev_t)<(next_t-t))
+				{
+					set_selected_keyframe(*(kf_list_->find_prev(t)));
+					queue_draw();
+					selected_=true;
+				}
+				else
+				{
+					set_selected_keyframe(*(kf_list_->find_next(t)));
+					queue_draw();
+					selected_=true;
+				}
 				return true;
 			}
 			else
 			{
-				return true;
+				return false;
 			}
 		}
+
 		break;
 	case GDK_BUTTON_RELEASE:
-		if(editable_ && event->button.button==1)
+		if(editable_ && (event->button.button==1 /*|| event->button.button==3*/))
 		{
-		// 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_)
+				{
+					//if (event->button.button==3)
+					if(event->button.state & GDK_MOD1_MASK)
+					{
+						stat=perform_move_kf(true);
+					}
+					else
+					{
+						stat=perform_move_kf(false);
+					}
+				}
+			dragging_=false;
+			return stat;
 		}
+		break;
 	default:
 		break;
 	}
-
-
 	return false;
 }
 
@@ -268,3 +409,17 @@ Widget_Keyframe_List::set_fps(float d)
 		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());
+	}
+}
+
+