When calculating the start and end frames, round to the nearest integer rather than...

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_text.cpp b/synfig-studio/trunk/src/gtkmm/state_text.cpp
index dd2bba5..c0639a4 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_text.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_text.cpp
@@ -280,6 +280,7 @@ StateText_Context::StateText_Context(CanvasView *canvas_view):
 
        widget_orientation.set_digits(2);
 
+       options_table.attach(*manage(new Gtk::Label(_("Text Tool"))),           0, 2, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(entry_id,                                                                          0, 2, 1, 2, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(checkbutton_paragraph,                                                     0, 2, 2, 3, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
        options_table.attach(*manage(new Gtk::Label(_("Size:"))),                       0, 1, 3, 4, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
@@ -347,6 +348,8 @@ StateText_Context::~StateText_Context()
 
        get_work_area()->queue_draw();
 
+       get_canvas_view()->queue_rebuild_ducks();
+
        App::toolbox->refresh();
 }
 
@@ -383,6 +386,8 @@ StateText_Context::make_text(const Point& _point)
        }
 
        synfigapp::SelectionManager::LayerList layer_selection;
+       if (!getenv("SYNFIG_TOOLS_CLEAR_SELECTION"))
+               layer_selection = get_canvas_view()->get_selection_manager()->get_selected_layers();
 
        const synfig::TransformStack& transform(get_canvas_view()->get_curr_transform_stack());
        const Point point(transform.unperform(_point));