From: dooglus Date: Sat, 13 Oct 2007 03:05:37 +0000 (+0000) Subject: Allow both 'name' and renddesc parameters to be changed at the same time in the canva... X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=d2200728165e17cf4d0eca7b821e704ad4085626;p=synfig.git Allow both 'name' and renddesc parameters to be changed at the same time in the canvas properties dialog. git-svn-id: http://svn.voria.com/code@921 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp index 68c6406..f437c12 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp @@ -219,14 +219,14 @@ CanvasProperties::on_rend_desc_changed() void CanvasProperties::on_apply_pressed() { - if(dirty_rend_desc) - canvas_interface_->set_rend_desc(widget_rend_desc.get_rend_desc()); if(entry_id.get_text()!=canvas_interface_->get_canvas()->get_id()) canvas_interface_->set_id(entry_id.get_text()); if(entry_name.get_text()!=canvas_interface_->get_canvas()->get_name()) canvas_interface_->set_name(entry_name.get_text()); if(entry_description.get_text()!=canvas_interface_->get_canvas()->get_description()) canvas_interface_->set_description(entry_description.get_text()); + if(dirty_rend_desc) // do this last, because it causes the dialog to be refreshed with currently set values + canvas_interface_->set_rend_desc(widget_rend_desc.get_rend_desc()); dirty_rend_desc=false; }