A little smaller, and better look. I don't like it so much though. Have to think...

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_timetrack.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 956c9e1..ac36340 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -414,8 +414,8 @@ Dock_Timetrack::Dock_Timetrack():
        if (header_height < 3)
                header_height = 22;
 
-       widget_timeslider_->set_size_request(-1,header_height);
-       widget_kf_list_->set_size_request(-1,header_height);
+       widget_timeslider_->set_size_request(-1,header_height-8);
+       widget_kf_list_->set_size_request(-1,8);
 
        hscrollbar_=new Gtk::HScrollbar();
        vscrollbar_=new Gtk::VScrollbar();
@@ -504,17 +504,16 @@ Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
                widget_timeslider_->set_global_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate());
 
                widget_kf_list_->set_time_adjustment(&canvas_view->time_adjustment());
-               widget_kf_list_->set_fps(canvas_view->get_canvas()->rend_desc().get_frame_rate());
-               widget_kf_list_->set_kf_list(canvas_view->get_canvas()->keyframe_list());
+               widget_kf_list_->set_canvas_interface(canvas_view->canvas_interface());
 
                vscrollbar_->set_adjustment(*tree_view->get_vadjustment());
                hscrollbar_->set_adjustment(canvas_view->time_window_adjustment());
-               table_=new Gtk::Table(2,2);
+               table_=new Gtk::Table(2,3);
                table_->attach(*widget_timeslider_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
-               table_->attach(*widget_kf_list_, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
-               table_->attach(*tree_view, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-               table_->attach(*hscrollbar_, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
-               table_->attach(*vscrollbar_, 1, 2, 0, 2, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND);
+               table_->attach(*widget_kf_list_, 0, 1, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+               table_->attach(*tree_view, 0, 1, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+               table_->attach(*hscrollbar_, 0, 1, 3, 4, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::SHRINK);
+               table_->attach(*vscrollbar_, 1, 2, 0, 3, Gtk::FILL|Gtk::SHRINK, Gtk::FILL|Gtk::EXPAND);
                add(*table_);
 
                //add(*last_widget_curves_);