smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-09 16:24:57 +01:00
Code Issues Projects Releases Wiki Activity

Canvas: re-use Solver as much as possible, with possible (but not substantive) speedup; remove debug output

Browse source
This commit is contained in:
Paul Davis 2020-06-25 15:03:26 -06:00
parent 815eb82882
commit aa62460081
9 changed files with 85 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

19
libs/canvas/constraint_packer.cc
View file

@ -42,10 +42,14 @@ ConstraintPacker::ConstraintPacker (Canvas* canvas)
, width (X_("packer width"))
, height (X_("packer height"))
, in_alloc (false)
, _need_constraint_update (false)
{
set_fill (false);
set_outline (false);
set_layout_sensitive (true);
_solver.addEditVariable (width, kiwi::strength::strong);
_solver.addEditVariable (height, kiwi::strength::strong);
}
ConstraintPacker::ConstraintPacker (Item* parent)
@ -53,16 +57,19 @@ ConstraintPacker::ConstraintPacker (Item* parent)
, width (X_("packer width"))
, height (X_("packer height"))
, in_alloc (false)
, _need_constraint_update (false)
{
set_fill (false);
set_outline (false);
set_layout_sensitive (true);
_solver.addEditVariable (width, kiwi::strength::strong);
_solver.addEditVariable (height, kiwi::strength::strong);
}
void
ConstraintPacker::compute_bounding_box () const
{
cerr << whoami() << " CBB from " << _allocation << endl;
_bounding_box = _allocation;
_bounding_box_dirty = false;
}
@ -268,6 +275,7 @@ ConstraintPacker::add_constrained_internal (Item* item, ConstrainedItem* ci)
Item::add (item);
item->set_layout_sensitive (true);
constrained_map.insert (std::make_pair (item, ci));
_need_constraint_update = true;
child_changed (true);
}
@ -299,6 +307,7 @@ ConstraintPacker::remove (Item* item)
}
_need_constraint_update = true;
}
void
@ -308,3 +317,11 @@ ConstraintPacker::apply (Solver* s)
x->second->constrained (*this);
}
}
void
ConstraintPacker::update_constraints ()
{
_solver.reset ();
_solver.addEditVariable (width, kiwi::strength::strong);
_solver.addEditVariable (height, kiwi::strength::strong);
}