Fix silly typo in last commit.

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

diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp
index 09c38f2..c4ab7d7 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -828,18 +828,22 @@ WorkArea::~WorkArea()
                render_idle_func_id=0;
 }
 
+#ifdef SINGLE_THREADED
 bool
 WorkArea::get_updating()const
 {
        return App::single_threaded && async_renderer && async_renderer->updating;
 }
+#endif
 
+#ifdef SINGLE_THREADED
 void
 WorkArea::stop_updating(bool cancel)
 {
        async_renderer->stop();
        if (cancel) canceled_=true;
 }
+#endif
 
 void
 WorkArea::save_meta_data()
@@ -1164,7 +1168,7 @@ WorkArea::on_key_press_event(GdkEventKey* event)
                        break;
        }
 
-       synfigapp::Action::PassiveGrouper grouper(instance.get(),"Nudge");
+       synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Nudge"));
 
        // Grid snap does not apply to nudging
        bool grid_snap_holder(get_grid_snap());
@@ -1367,15 +1371,19 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                                                // if the tangent isn't split, then split it
                                                if (!((*(parent_value_node->get_link("split")))(get_time()).get(bool())))
                                                {
-                                                       get_canvas_view()->canvas_interface()->
+                                                       if (get_canvas_view()->canvas_interface()->
                                                                change_value(synfigapp::ValueDesc(parent_value_node,
                                                                                                                                  parent_value_node->get_link_index_from_name("split")),
-                                                                                        true);
-                                                       // rebuild the ducks from scratch, so the tangents ducks aren't connected
-                                                       get_canvas_view()->rebuild_ducks();
-
-                                                       // reprocess the mouse click
-                                                       return on_drawing_area_event(event);
+                                                                                        true))
+                                                       {
+                                                               // rebuild the ducks from scratch, so the tangents ducks aren't connected
+                                                               get_canvas_view()->rebuild_ducks();
+
+                                                               // reprocess the mouse click
+                                                               return on_drawing_area_event(event);
+                                                       }
+                                                       else
+                                                               return true;
                                                }
                                        } else {
                                                // I don't know how to access the vertex from the tangent duck when originally drawing the bline in the bline tool
@@ -1620,7 +1628,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                else
                if(dragging==DRAG_DUCK)
                {
-                       synfigapp::Action::PassiveGrouper grouper(instance.get(),"Move");
+                       synfigapp::Action::PassiveGrouper grouper(instance.get(),_("Move"));
                        dragging=DRAG_NONE;
                        //translate_selected_ducks(mouse_pos);
                        set_axis_lock(false);
@@ -2129,8 +2137,6 @@ WorkArea::refresh(GdkEventExpose*event)
                drawing_frame->unset_bg(Gtk::STATE_NORMAL);
 #endif
 
-       previous_focus=get_focus_point();
-
        return true;
 }
 
@@ -2216,12 +2222,14 @@ public:
 bool
 studio::WorkArea::async_update_preview()
 {
+#ifdef SINGLE_THREADED
        if (get_updating())
        {
                stop_updating();
                queue_render_preview();
                return false;
        }
+#endif
 
        async_renderer=0;
 
@@ -2573,20 +2581,24 @@ studio::WorkArea::zoom_out()
 void
 studio::WorkArea::zoom_fit()
 {
-       // This really doesn't zoom to fit. Bug.
-       zoom_norm();
+       float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
+       if (zoom / new_zoom > 0.995 && new_zoom / zoom > 0.995)
+       {
+               set_zoom(prev_zoom);
+               return set_focus_point(previous_focus);
+       }
+       previous_focus = get_focus_point();
+       prev_zoom = zoom;
+       set_zoom(new_zoom);
+       set_focus_point(Point(0,0));
 }
 
 void
 studio::WorkArea::zoom_norm()
 {
-       if(zoom==1.0)
-               set_zoom(prev_zoom);
-       else
-       {
-               prev_zoom=zoom;
-               set_zoom(1.0f);
-       }
+       if (zoom == 1.0) return set_zoom(prev_zoom);
+       prev_zoom = zoom;
+       set_zoom(1.0f);
 }
 
 gboolean