Keep correct size on the animate button after pressed.

[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 7c3aa0a..a3c42cc 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -951,7 +951,6 @@ CanvasView::create_time_bar()
        //Gtk::HScrollbar *time_scroll = manage(new class Gtk::HScrollbar(time_adjustment()));
        //TIME BAR TEMPORARY POSITION
        //Widget_Timeslider *time_scroll = manage(new Widget_Timeslider);
-       timeslider->show();
        timeslider->set_time_adjustment(&time_adjustment());
        timeslider->set_bounds_adjustment(&time_window_adjustment());
        //layout_table->attach(*timeslider, 0, 1, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::SHRINK|Gtk::FILL);
@@ -960,7 +959,7 @@ CanvasView::create_time_bar()
        tooltips.set_tip(*timeslider,_("Changes the current time"));
        time_window_scroll->show();
        timeslider->show();
-       time_window_scroll->set_flags(Gtk::CAN_FOCUS);
+       //time_window_scroll->set_flags(Gtk::CAN_FOCUS); // Uncomment this produce bad render of the HScroll
        timeslider->set_flags(Gtk::CAN_FOCUS);
 
        //time_scroll->signal_value_changed().connect(sigc::mem_fun(*work_area, &studio::WorkArea::render_preview_hook));
@@ -2581,10 +2580,11 @@ void
 CanvasView::on_mode_changed(synfigapp::CanvasInterface::Mode mode)
 {
        // If the animate flag was set in mode...
+       Gtk::IconSize iconsize=Gtk::IconSize::from_name("synfig-small_icon");
        if(mode&synfigapp::MODE_ANIMATE)
        {
                Gtk::Image *icon;
-               icon=manage(new Gtk::Image(Gtk::StockID("gtk-no"),Gtk::ICON_SIZE_BUTTON));
+               icon=manage(new Gtk::Image(Gtk::StockID("gtk-no"),iconsize));
                animatebutton->remove();
                animatebutton->add(*icon);
                tooltips.set_tip(*animatebutton,_("In Animate Editing Mode"));
@@ -2594,7 +2594,7 @@ CanvasView::on_mode_changed(synfigapp::CanvasInterface::Mode mode)
        else
        {
                Gtk::Image *icon;
-               icon=manage(new Gtk::Image(Gtk::StockID("gtk-yes"),Gtk::ICON_SIZE_BUTTON));
+               icon=manage(new Gtk::Image(Gtk::StockID("gtk-yes"),iconsize));
                animatebutton->remove();
                animatebutton->add(*icon);
                tooltips.set_tip(*animatebutton,_("Not in Animate Editing Mode"));