X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Flayerparamtreestore.cpp;h=4f6cf016854ede38f53fb4ea192dfc2c4635800c;hb=c47c55f3496571ee27d1ad0f9eae1974a50d82eb;hp=d583be83be4d2c99c0c85dd7149cf0be2cf3d44e;hpb=a11a35f647a3a6e61518ddfd61c9e199e25da3ef;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index d583be8..4f6cf01 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -39,6 +39,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -131,11 +133,7 @@ LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int Glib::Value x; g_value_init(x.gobj(),x.value_type()); - - if(!layer->get_description().empty()) - x.set(layer->get_description()); - else - x.set(layer->get_local_name()); + x.set(layer->get_non_empty_description()); g_value_init(value.gobj(),x.value_type()); g_value_copy(x.gobj(),value.gobj()); @@ -520,13 +518,13 @@ LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc) } void -LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/) +LayerParamTreeStore::on_value_node_added(synfig::ValueNode::Handle /*value_node*/) { // queue_refresh(); } void -LayerParamTreeStore::on_value_node_deleted(etl::handle /*value_node*/) +LayerParamTreeStore::on_value_node_deleted(synfig::ValueNode::Handle /*value_node*/) { // queue_refresh(); } @@ -544,7 +542,7 @@ LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*val } void -LayerParamTreeStore::on_value_node_changed(etl::handle /*value_node*/) +LayerParamTreeStore::on_value_node_changed(synfig::ValueNode::Handle /*value_node*/) { queue_refresh(); }