X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=c4f8be6eea49a76fd7fe4eede0e7a5ad4818b289;hb=3a307f6764cbc3b6aa81a55f61b83e0001c38138;hp=e783687b920db15578bc8b45a12afe927e098536;hpb=cf8349439dd89fa8a149283b00d525ebf96f1124;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index e783687..c4f8be6 100644 --- 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()); @@ -1620,7 +1624,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); @@ -1924,9 +1928,6 @@ WorkArea::refresh_dimension_info() pw=canvaswidth/w; ph=canvasheight/h; - Duckmatic::set_flip_x(pw < 0); - Duckmatic::set_flip_y(ph > 0); - scrollx_adjustment.set_page_increment(abs(get_grid_size()[0])); scrollx_adjustment.set_step_increment(abs(pw)); scrollx_adjustment.set_lower(-abs(canvaswidth)); @@ -2219,12 +2220,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;