projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
childrentreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
index
fecae7b
..
7c2bab4
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/childrentreestore.cpp
@@
-148,7
+148,6
@@
ChildrenTreeStore::refresh_value_nodes()
for(iter = children.begin(); iter != children.end(); ++iter)
{
Gtk::TreeRow row=*iter;
for(iter = children.begin(); iter != children.end(); ++iter)
{
Gtk::TreeRow row=*iter;
- //DEBUGPOINT();
refresh_row(row);
}
}
refresh_row(row);
}
}
@@
-185,7
+184,7
@@
ChildrenTreeStore::refresh_row(Gtk::TreeModel::Row &row, bool /*do_children*/)
}
void
}
void
-ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
+ChildrenTreeStore::on_canvas_added(
synfig::
Canvas::Handle canvas)
{
Gtk::TreeRow row = *(prepend(canvas_row.children()));
{
Gtk::TreeRow row = *(prepend(canvas_row.children()));
@@
-208,13
+207,13
@@
ChildrenTreeStore::on_canvas_added(Canvas::Handle canvas)
}
void
}
void
-ChildrenTreeStore::on_canvas_removed(Canvas::Handle /*canvas*/)
+ChildrenTreeStore::on_canvas_removed(
synfig::
Canvas::Handle /*canvas*/)
{
rebuild_canvases();
}
void
{
rebuild_canvases();
}
void
-ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
+ChildrenTreeStore::on_value_node_added(
synfig::
ValueNode::Handle value_node)
{
// if(value_node->get_id().find("Unnamed")!=String::npos)
// return;
{
// if(value_node->get_id().find("Unnamed")!=String::npos)
// return;
@@
-225,7
+224,7
@@
ChildrenTreeStore::on_value_node_added(ValueNode::Handle value_node)
}
void
}
void
-ChildrenTreeStore::on_value_node_deleted(
etl::handle<ValueNode>
value_node)
+ChildrenTreeStore::on_value_node_deleted(
synfig::ValueNode::Handle
value_node)
{
Gtk::TreeIter iter;
//int i(0);
{
Gtk::TreeIter iter;
//int i(0);
@@
-241,7
+240,6
@@
bool
ChildrenTreeStore::execute_changed_value_nodes()
{
Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
ChildrenTreeStore::execute_changed_value_nodes()
{
Profiler profiler("ChildrenTreeStore::execute_changed_value_nodes()");
- DEBUGPOINT();
if(!replaced_set_.empty())
rebuild_value_nodes();
if(!replaced_set_.empty())
rebuild_value_nodes();
@@
-298,7
+296,7
@@
ChildrenTreeStore::execute_changed_value_nodes()
}
void
}
void
-ChildrenTreeStore::on_value_node_changed(
etl::handle<ValueNode>
value_node)
+ChildrenTreeStore::on_value_node_changed(
synfig::ValueNode::Handle
value_node)
{
if(!value_node->is_exported())
{
if(!value_node->is_exported())
@@
-333,7
+331,7
@@
ChildrenTreeStore::on_value_node_changed(etl::handle<ValueNode> value_node)
}
void
}
void
-ChildrenTreeStore::on_value_node_renamed(
etl::handle<ValueNode>
value_node)
+ChildrenTreeStore::on_value_node_renamed(
synfig::ValueNode::Handle
value_node)
{
rebuild_value_nodes();
}
{
rebuild_value_nodes();
}