Again, make sure the Default Interpolation widget always displays its…

… proper part
synfig · Oct 31, 2014 · b87683f · b87683f
1 parent 320c963
commit b87683f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/synfig-studio/src/gui/canvasview.cpp b/synfig-studio/src/gui/canvasview.cpp
@@ -1132,6 +1132,9 @@ CanvasView::create_time_bar()
 	hscroll->hide();
 
 	widget_interpolation->signal_changed().connect(sigc::mem_fun(*this,&studio::CanvasView::on_interpolation_changed));
+	widget_interpolation_scroll->add_events(Gdk::POINTER_MOTION_MASK);
+	widget_interpolation_scroll->signal_event().connect(sigc::bind_return(sigc::mem_fun(*this,&studio::CanvasView::on_interpolation_event),false));
+
 	synfigapp::Main::signal_interpolation_changed().connect(sigc::mem_fun(*this,&studio::CanvasView::interpolation_refresh));
 	synfigapp::Main::set_interpolation(INTERPOLATION_CLAMPED); // Clamped by default.
 	interpolation_refresh();
@@ -4386,14 +4389,16 @@ void
 CanvasView::interpolation_refresh()
 {
 	widget_interpolation->set_value(synfigapp::Main::get_interpolation());
-	widget_interpolation_scroll->get_hscrollbar()->get_adjustment()->set_value(0);
-	synfig::info("!!!-1");
 }
 
 void
 CanvasView::on_interpolation_changed()
 {
 	synfigapp::Main::set_interpolation(Waypoint::Interpolation(widget_interpolation->get_value()));
+}
+
+void
+CanvasView::on_interpolation_event(GdkEvent *event)
+{
 	widget_interpolation_scroll->get_hscrollbar()->get_adjustment()->set_value(0);
-	synfig::info("!!!-2");
 }
diff --git a/synfig-studio/src/gui/canvasview.h b/synfig-studio/src/gui/canvasview.h
@@ -545,6 +545,7 @@ class CanvasView : public Dockable, public etl::shared_object
 
 	void interpolation_refresh();
 	void on_interpolation_changed();
+	void on_interpolation_event(GdkEvent *event);
 
 
 	/*