From: Carlos Lopez <carlos@pcnuevo.(none)>
Date: Mon, 27 Jul 2009 15:03:54 +0000 (+0200)
Subject: Merge branch 'genete_keyframe_list' into genete_master
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=0b906a33b4c24a16f7a48441b7edfd0e6c8d5922;hp=12876a2268b54c0cc2f381b5066a3bbc8ca623e8;p=synfig.git

Merge branch 'genete_keyframe_list' into genete_master
---

diff --git a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
index bc1a73c..9268fc2 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp
@@ -93,6 +93,7 @@ _curve_selection_changed(Gtk::TreeView* param_tree_view,Widget_Curves* curves)
 	if(!param_tree_view->get_selection()->count_selected_rows())
 	{
 		curves->clear();
+		curves->refresh();
 		return;
 	}
 
diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index b4a5678..2260dad 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -474,6 +474,9 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 	if(!time_adjustment_ || !range_adjustment_ || !h || !w)
 		return false;
 
+	if(!curve_list_.size())
+		return false;
+
 	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(get_window()));
 
 	const Real t_begin(time_adjustment_->get_lower());
@@ -497,10 +500,41 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/)
 	gc->set_rgb_fg_color(Gdk::Color("#4f4f4f"));
 	get_window()->draw_rectangle(gc, false, 0, round_to_int((0-r_bottom)/dr), w, 0);
 
+	// This try to find a valid vanvas to show the keyframes of those
+	// valuenodes. If not canvas found then no keyframes marks are shown.
+	synfig::Canvas::Handle canvas=0;
+	for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter)
+	{
+		canvas=curve_iter->value_desc.get_canvas();
+		if(canvas)
+			break;
+	}
+
+	if(canvas)
+	{
+	// Draw vertical lines for the keyframes marks.
+		const synfig::KeyframeList& keyframe_list(canvas->keyframe_list());
+		synfig::KeyframeList::const_iterator iter;
+
+		for(iter=keyframe_list.begin();iter!=keyframe_list.end();++iter)
+		{
+			if(!iter->get_time().is_valid())
+				continue;
+
+			const int x((int)((float)w/(t_end-t_begin)*(iter->get_time()-t_begin)));
+			if(iter->get_time()>=t_begin && iter->get_time()<t_end)
+			{
+				gc->set_rgb_fg_color(Gdk::Color("#a07f7f")); // It should be user selectable
+				get_window()->draw_rectangle(gc, true, x, 0, 1, h);
+			}
+		}
+	}
+
 	// Draw current time
-	gc->set_rgb_fg_color(Gdk::Color("#00007f"));
+	gc->set_rgb_fg_color(Gdk::Color("#0000ff")); // It should be user selectable
 	get_window()->draw_rectangle(gc, false, round_to_int((time_adjustment_->get_value()-t_begin)/dt), 0, 0, h);
 
+	// Draw curves for the valuenodes stored in the curve list
 	for(curve_iter=curve_list_.begin();curve_iter!=curve_list_.end();++curve_iter)
 	{
 		Real t;