Remove spaces and tabs at end of lines.

[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 5f17dc1..9038bb1 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/workarea.cpp
+++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp
@@ -1374,7 +1374,7 @@ WorkArea::on_drawing_area_event(GdkEvent *event)
                                                        if (get_canvas_view()->canvas_interface()->
                                                                change_value(synfigapp::ValueDesc(parent_value_node,
                                                                                                                                  parent_value_node->get_link_index_from_name("split")),
-                                                                                        true);
+                                                                                        true))
                                                        {
                                                                // rebuild the ducks from scratch, so the tangents ducks aren't connected
                                                                get_canvas_view()->rebuild_ducks();
@@ -2283,7 +2283,7 @@ studio::WorkArea::async_update_preview()
        // if we have lots of pixels to render and the tile renderer isn't disabled, use it
        int div;
        div = low_resolution ? low_res_pixel_size : 1;
-       if (w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER"))
+       if ((w*h > 240*div*135*div && !getenv("SYNFIG_DISABLE_TILE_RENDER")) || getenv("SYNFIG_FORCE_TILE_RENDER"))
        {
                // do a tile render
                handle<WorkAreaTarget> trgt(new class WorkAreaTarget(this,w,h));
@@ -2545,7 +2545,7 @@ WorkArea::queue_scroll()
                        drawing_area->queue_draw_area(      0, 0,       1, maxy);
                        drawing_area->queue_draw_area(maxx-dx, 0, maxx-dx, maxy);
                }
-               else if (dx < 0) 
+               else if (dx < 0)
                {
                        drawing_area->queue_draw_area(   maxx, 0,    maxx, maxy);
                        drawing_area->queue_draw_area(    -dx, 0,     -dx, maxy);
@@ -2555,7 +2555,7 @@ WorkArea::queue_scroll()
                        drawing_area->queue_draw_area(0,       0, maxx,       1);
                        drawing_area->queue_draw_area(0, maxy-dy, maxx, maxy-dy);
                }
-               else if (dy < 0) 
+               else if (dy < 0)
                {
                        drawing_area->queue_draw_area(0,    maxy, maxx,    maxy);
                        drawing_area->queue_draw_area(0,     -dy, maxx,     -dy);
@@ -2581,7 +2581,8 @@ studio::WorkArea::zoom_out()
 void
 studio::WorkArea::zoom_fit()
 {
-       float new_zoom(min(drawing_area->get_width() * zoom / w, drawing_area->get_height() * zoom / h));
+       float new_zoom(min(drawing_area->get_width() * zoom / w,
+                                          drawing_area->get_height() * zoom / h) * 0.995);
        if (zoom / new_zoom > 0.995 && new_zoom / zoom > 0.995)
        {
                set_zoom(prev_zoom);
@@ -2649,7 +2650,7 @@ studio::WorkArea::queue_render_preview()
                //synfig::info("queue_render_preview(): (re)queuing...");
                //render_idle_func_id=g_idle_add_full(G_PRIORITY_DEFAULT,__render_preview,this,NULL);
                render_idle_func_id=g_timeout_add_full(
-                       G_PRIORITY_DEFAULT,     // priority - 
+                       G_PRIORITY_DEFAULT,     // priority -
                        queue_time,                     // interval - the time between calls to the function, in milliseconds (1/1000ths of a second)
                        __render_preview,       // function - function to call
                        this,                           // data     - data to pass to function