X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_curves.cpp;h=2260dad0bf4e8426fad1223ed574191946325f87;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cf44f76810f9be2bd9a54a1ff1b4c29f1e4f6d36;hpb=04e736f96597bb36dbd6b8059d785269369b3321;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp index cf44f76..2260dad 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp @@ -500,16 +500,19 @@ 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); - // Draw current time - 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); + // 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; + } - // This is not the best solution but I guess that if the first valuenode - // has canvas then show the keyframes. Maybe I can loop all them until I find - // a valid canvas and use it for look to the keyframes. - synfig::Canvas::Handle canvas(curve_list_.begin()->value_desc.get_canvas()); if(canvas) { + // Draw vertical lines for the keyframes marks. const synfig::KeyframeList& keyframe_list(canvas->keyframe_list()); synfig::KeyframeList::const_iterator iter; @@ -526,6 +529,11 @@ Widget_Curves::redraw(GdkEventExpose */*bleh*/) } } } + + // Draw current time + 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) {