smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 20:55:48 +01:00
Code Issues Projects Releases Wiki Activity

Canvas: add a nice new syntax for constraint packing

Browse source
This commit is contained in:
Paul Davis 2020-06-28 21:36:22 -06:00
parent d6745f043c
commit 502a9e80dc
7 changed files with 367 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libs/canvas/cbox.cc
View file

@ -284,11 +284,11 @@ cBox::size_allocate (Rect const & r)
_solver.suggestValue (expanded_item_size, expanded_size);
_solver.updateVariables ();
//solver.dump (cerr);
_solver.dump (cerr);
//for (ConstrainedItemMap::const_iterator o = constrained_map.begin(); o != constrained_map.end(); ++o) {
//o->second->dump (cerr);
//}
for (ConstrainedItemMap::const_iterator o = constrained_map.begin(); o != constrained_map.end(); ++o) {
o->second->dump (cerr);
}
apply (&_solver);
@ -299,8 +299,11 @@ cBox::size_allocate (Rect const & r)
void
cBox::update_constraints ()
{
ConstraintPacker::update_constraints ();
/* must totally override ConstraintPacker::update_constraints() */
_solver.reset ();
_solver.addEditVariable (width, kiwi::strength::strong);
_solver.addEditVariable (height, kiwi::strength::strong);
_solver.addEditVariable (expanded_item_size, kiwi::strength::strong);
try {
@ -506,6 +509,8 @@ cBox::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
if (fill()) {
cerr << whoami() << " setting fill context with 0x" << std::hex << _fill_color << std::dec << " draw " << draw << endl;
setup_fill_context (context);
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
context->fill_preserve ();