Show the current_time_widget in the proper function and request minimum horizontal...

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

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 7223410..b3e243f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -972,12 +972,7 @@ CanvasView::create_time_bar()
        SMALL_BUTTON(animatebutton,"gtk-yes",_("Animate"));
        animatebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_animate_button_pressed));
        animatebutton->show();
-/*
-       NORMAL_BUTTON(keyframebutton,"synfig-keyframe_lock_all",_("All Keyframes Locked"));
-       keyframebutton->signal_clicked().connect(sigc::mem_fun(*this, &studio::CanvasView::on_keyframe_button_pressed));
-       keyframebutton->show();
-       keyframebutton->set_relief(Gtk::RELIEF_NONE);
-*/
+
        //Setup the audio display
        disp_audio->set_size_request(-1,32); //disp_audio->show();
        disp_audio->set_time_adjustment(&time_adjustment());
@@ -997,6 +992,8 @@ CanvasView::create_time_bar()
        current_time_widget->signal_value_changed().connect(
                sigc::mem_fun(*this,&CanvasView::on_current_time_widget_changed)
        );
+       current_time_widget->set_size_request(0,-1); // request horizontal shrink
+       current_time_widget->show();
 
        //Setup the FrameDial widget
        FrameDial *framedial = manage(new class FrameDial());
@@ -3214,7 +3211,7 @@ void
 CanvasView::show_timebar()
 {
        timebar->show();
-       current_time_widget->show();
+       //current_time_widget->show(); // not needed now that belongs to the timebar
 
        //keyframe_tab_child->show();
        if(layer_tree)