X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fworkarea.cpp;h=0dd4ffc8650e1ac575c9d6bef8e1ce0f4b644f0c;hb=9fec9e45acee8a602a11699eac2dea3a0bfe4154;hp=54216f3a38dff4ded1ccb82a41ee1d5c0053c1ec;hpb=1f59228ea073eb60029cddfb4ee1a70de7f40f3d;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 54216f3..0dd4ffc 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -810,6 +810,19 @@ WorkArea::~WorkArea() render_idle_func_id=0; } +bool +WorkArea::get_updating()const +{ + return App::single_threaded && async_renderer && async_renderer->updating; +} + +void +WorkArea::stop_updating(bool cancel) +{ + async_renderer->stop(); + if (cancel) canceled_=true; +} + void WorkArea::save_meta_data() { @@ -2174,9 +2187,10 @@ public: bool studio::WorkArea::async_update_preview() { - if (single_threaded() && async_renderer && async_renderer->updating == true) + if (get_updating()) { - async_renderer->stop(); + stop_updating(); + queue_render_preview(); return false; } @@ -2631,12 +2645,12 @@ studio::WorkArea::set_cursor(Gdk::CursorType x) drawing_area->get_window()->set_cursor(Gdk::Cursor(x)); } -#include "iconcontroler.h" +#include "iconcontroller.h" void studio::WorkArea::refresh_cursor() { -// set_cursor(IconControler::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window())); +// set_cursor(IconController::get_tool_cursor(canvas_view->get_smach().get_state_name(),drawing_area->get_window())); } void