X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_curves.cpp;h=2260dad0bf4e8426fad1223ed574191946325f87;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cef497781cd32b5d069e19b6171137675ebb5805;hpb=de6b5bb9824313ddedc0fb5e3b4bdaae2ff09882;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
index cef4977..2260dad 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**  Copyright (c) 2008 Gerco Ballintijn
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -293,7 +294,10 @@ struct studio::Widget_Curves::CurveStruct : sigc::trackable
 	static bool is_not_supported(const synfigapp::ValueDesc& x)
 	{
 		return x.get_value_type() == ValueBase::TYPE_STRING
-			|| x.get_value_type() == ValueBase::TYPE_CANVAS;
+			|| x.get_value_type() == ValueBase::TYPE_CANVAS
+			|| x.get_value_type() == ValueBase::TYPE_GRADIENT
+			|| x.get_value_type() == ValueBase::TYPE_LIST
+			|| x.get_value_type() == ValueBase::TYPE_SEGMENT;
 	}
 };
 
@@ -470,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());
@@ -493,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;