X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Faction_system.cpp;h=cc20a2bc06c3c5a1575f562adcf9277a927ee7a7;hb=6542407861e99a0ed76bd1ba9d03ca164ec7269b;hp=daeab597692acdbdc1d4523c79c649e530c2b157;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp index daeab59..cc20a2b 100644 --- a/synfig-studio/trunk/src/synfigapp/action_system.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp @@ -66,7 +66,7 @@ Action::System::~System() } bool -Action::System::perform_action(handle action) +Action::System::perform_action(etl::handle action) { handle uim(get_ui_interface()); @@ -198,7 +198,6 @@ Action::System::perform_action(handle action) { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -209,7 +208,7 @@ Action::System::perform_action(handle action) } bool -synfigapp::Action::System::undo_(handle uim) +synfigapp::Action::System::undo_(etl::handle uim) { handle action(undo_action_stack().front()); most_recent_action_=action; @@ -299,7 +298,6 @@ synfigapp::Action::System::undo() { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -308,7 +306,7 @@ synfigapp::Action::System::undo() } bool -Action::System::redo_(handle uim) +Action::System::redo_(etl::handle uim) { handle action(redo_action_stack().front()); most_recent_action_=action; @@ -398,7 +396,6 @@ Action::System::redo() { handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } } @@ -511,7 +508,6 @@ Action::System::set_action_status(etl::handle action, bool x) Canvas::Handle canvas=canvas_specific->get_canvas(); handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - //DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } @@ -532,7 +528,6 @@ Action::System::set_action_status(etl::handle action, bool x) Canvas::Handle canvas=canvas_specific->get_canvas(); handle canvas_interface=static_cast(this)->find_canvas_interface(canvas); assert(canvas_interface); - DEBUGPOINT(); //canvas_interface->signal_dirty_preview()(); } @@ -542,7 +537,7 @@ Action::System::set_action_status(etl::handle action, bool x) return false; } -Action::PassiveGrouper::PassiveGrouper(etl::loose_handle instance_,synfig::String name_): +Action::PassiveGrouper::PassiveGrouper(etl::loose_handle instance_,synfig::String name_): instance_(instance_), name_(name_), redraw_requested_(false), @@ -553,14 +548,12 @@ Action::PassiveGrouper::PassiveGrouper(etl::loose_handle instanc } void -Action::PassiveGrouper::request_redraw(handle x) +Action::PassiveGrouper::request_redraw(etl::handle x) { -/* DEBUGPOINT(); - if(instance_->group_stack_.empty()) +/* if(instance_->group_stack_.empty()) { if(x!=canvas_interface_) { - DEBUGPOINT(); x->signal_dirty_preview()(); } @@ -568,21 +561,16 @@ Action::PassiveGrouper::request_redraw(handle x) } else { - DEBUGPOINT(); if(instance_->group_stack_.back()==this) { - DEBUGPOINT(); redraw_requested_=true; } else { - DEBUGPOINT(); instance_->group_stack_.back()->request_redraw(x); redraw_requested_=false; } - DEBUGPOINT(); } - DEBUGPOINT(); */ if(x) { @@ -678,7 +666,6 @@ Action::PassiveGrouper::~PassiveGrouper() if(instance_->group_stack_.empty()) { assert(canvas_interface_); - DEBUGPOINT(); canvas_interface_->signal_dirty_preview()(); } else