Module: synfig/synfig
Branch: master
Commit: e141439cbbdfbd8c711386d988d398bb2f2ee47a
URL:    
http://synfig.git.sourceforge.net/git/gitweb.cgi?p=synfig/synfig;a=commit;h=e141439cbbdfbd8c711386d988d398bb2f2ee47a

Author: Carlos Lopez <[email protected]>
Date:   Sun Nov 28 10:07:07 2010 +0100

Fix bug: fps rounding to integer - ID: 3104763
Also fixed that widget time slider frames per second was not updated when 
changing the render description.
It produced bad time cursor position when dragging the time cursor and the 
document fps is not 24 fps (the default one for widget time slider)
Now when the render description is modified, the sock time track widget time 
slider fps is updated.

---

 synfig-studio/src/gui/docks/dock_timetrack.cpp |   10 ++++++++++
 synfig-studio/src/gui/docks/dock_timetrack.h   |    1 +
 synfig-studio/src/gui/renddesc.cpp             |    2 +-
 3 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/synfig-studio/src/gui/docks/dock_timetrack.cpp 
b/synfig-studio/src/gui/docks/dock_timetrack.cpp
index adb8998..9d10032 100644
--- a/synfig-studio/src/gui/docks/dock_timetrack.cpp
+++ b/synfig-studio/src/gui/docks/dock_timetrack.cpp
@@ -419,6 +419,7 @@ 
Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
        
canvas_view->time_adjustment().signal_changed().connect(sigc::mem_fun(*tree_view,&Gtk::TreeView::queue_draw));
 
        canvas_view->set_ext_widget(get_name(),tree_view);
+       
canvas_view->canvas_interface()->signal_rend_desc_changed().connect(sigc::mem_fun(*this,&studio::Dock_Timetrack::refresh_rend_desc));
 }
 
 void
@@ -444,6 +445,15 @@ Dock_Timetrack::refresh_selected_param()
 }
 
 void
+Dock_Timetrack::refresh_rend_desc()
+{
+       if(App::get_selected_canvas_view())
+       {
+               
widget_timeslider_->set_global_fps(App::get_selected_canvas_view()->get_canvas()->rend_desc().get_frame_rate());
+       }
+}
+
+void
 Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> 
canvas_view)
 {
        if(table_)
diff --git a/synfig-studio/src/gui/docks/dock_timetrack.h 
b/synfig-studio/src/gui/docks/dock_timetrack.h
index 5525ee6..27406c4 100644
--- a/synfig-studio/src/gui/docks/dock_timetrack.h
+++ b/synfig-studio/src/gui/docks/dock_timetrack.h
@@ -56,6 +56,7 @@ protected:
        virtual void changed_canvas_view_vfunc(etl::loose_handle<CanvasView> 
canvas_view);
 
        void refresh_selected_param();
+       void refresh_rend_desc();
 
 public:
 
diff --git a/synfig-studio/src/gui/renddesc.cpp 
b/synfig-studio/src/gui/renddesc.cpp
index c88ac87..f67e603 100644
--- a/synfig-studio/src/gui/renddesc.cpp
+++ b/synfig-studio/src/gui/renddesc.cpp
@@ -290,7 +290,7 @@ Widget_RendDesc::on_fps_changed()
 {
        if(update_lock)return;
        UpdateLock lock(update_lock);
-       rend_desc_.set_frame_rate((int)(adjustment_fps.get_value()+0.5));
+       rend_desc_.set_frame_rate(adjustment_fps.get_value());
        refresh();
        signal_changed()();
 }


------------------------------------------------------------------------------
Increase Visibility of Your 3D Game App & Earn a Chance To Win $500!
Tap into the largest installed PC base & get more eyes on your game by
optimizing for Intel(R) Graphics Technology. Get started today with the
Intel(R) Software Partner Program. Five $500 cash prizes are up for grabs.
http://p.sf.net/sfu/intelisp-dev2dev
_______________________________________________
Synfig-devl mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl

Reply via email to