smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-06 23:05:04 +01:00
Code Issues Projects Releases Wiki Activity

Canvas: fix fill/outline area for a cBox

Browse source
This commit is contained in:
Paul Davis 2020-06-21 12:52:51 -06:00
parent e95d3d37b4
commit 086415a799
2 changed files with 52 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/canvas/canvas/cbox.h
View file

@ -59,6 +59,8 @@ public:
void preferred_size(Duple& minimum, Duple& natural) const; void preferred_size(Duple& minimum, Duple& natural) const;
void size_allocate (Rect const &); void size_allocate (Rect const &);
void render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const;
protected: protected:
Orientation orientation; Orientation orientation;

57
libs/canvas/cbox.cc
View file

@ -270,7 +270,9 @@ cBox::size_allocate (Rect const & r)
expanded_size = (r.width() - _left_margin - _right_margin - ((total - 1) * _spacing) - non_expanding_used) / n_expanding; expanded_size = (r.width() - _left_margin - _right_margin - ((total - 1) * _spacing) - non_expanding_used) / n_expanding;
} }
// cerr << "\n\n\n" << whoami() << " SIZE-ALLOC " << r << " expanded items (" << n_expanding << ")will be " << expanded_size << " neu " << non_expanding_used << " t = " << total << " s " << _spacing << '\n'; cerr << "\n\n\n" << whoami() << " SIZE-ALLOC " << r << " expanded items (" << n_expanding << ")will be " << expanded_size << " neu " << non_expanding_used << " t = " << total << " s " << _spacing
<< " t " << _top_margin << " b " << _bottom_margin << " l " << _left_margin << " r " << _right_margin
<< endl;
Order::iterator prev = order.end(); Order::iterator prev = order.end();
@ -352,7 +354,11 @@ cBox::child_changed (bool bbox_changed)
m_second_trailing, \ m_second_trailing, \
m_second_leading, \ m_second_leading, \
m_second_trailing_padding, \ m_second_trailing_padding, \
m_second_leading_padding) \ m_second_leading_padding, \
m_trailing_margin, \
m_leading_margin, \
m_second_trailing_margin, \
m_second_leading_margin) \
\ \
/* Add constraints that will size the item within this box */ \ /* Add constraints that will size the item within this box */ \
\ \
@ -409,7 +415,7 @@ cBox::child_changed (bool bbox_changed)
\ \
/* first item */ \ /* first item */ \
\ \
solver.addConstraint (bci->m_trailing() == _top_margin + bci->m_trailing_padding() | kiwi::strength::strong); \ solver.addConstraint (bci->m_trailing() == m_trailing_margin + bci->m_trailing_padding() | kiwi::strength::strong); \
\ \
} else { \ } else { \
/* subsequent items */ \ /* subsequent items */ \
@ -425,12 +431,12 @@ cBox::child_changed (bool bbox_changed)
solver.addConstraint (bci->m_second_leading_padding() == 0 | kiwi::strength::weak); \ solver.addConstraint (bci->m_second_leading_padding() == 0 | kiwi::strength::weak); \
\ \
solver.addConstraint (bci->m_second_trailing() + bci->m_second_dimension() == bci->m_second_leading()); \ solver.addConstraint (bci->m_second_trailing() + bci->m_second_dimension() == bci->m_second_leading()); \
solver.addConstraint (bci->m_second_trailing() == _left_margin + bci->m_second_trailing_padding() | kiwi::strength::strong); \ solver.addConstraint (bci->m_second_trailing() == m_second_trailing_margin + bci->m_second_trailing_padding() | kiwi::strength::strong); \
\ \
if (!(bci->secondary_axis_pack_options() & PackExpand) && natural_second_dimension > 0) { \ if (!(bci->secondary_axis_pack_options() & PackExpand) && natural_second_dimension > 0) { \
solver.addConstraint (bci->m_second_dimension() == natural_second_dimension); \ solver.addConstraint (bci->m_second_dimension() == natural_second_dimension); \
} else { \ } else { \
solver.addConstraint (bci->m_second_dimension() == alloc_second_dimension - (_left_margin + _right_margin + bci->m_second_leading_padding()) | kiwi::strength::strong); \ solver.addConstraint (bci->m_second_dimension() == alloc_second_dimension - (m_second_trailing_margin + m_second_leading_margin + bci->m_second_leading_padding()) | kiwi::strength::strong); \
} }
@ -440,7 +446,9 @@ cBox::add_vertical_box_constraints (kiwi::Solver& solver, BoxConstrainedItem* ci
add_box_constraints (solver, ci, prev, expanded_size, main_dimension, second_dimension, alloc_dimension, add_box_constraints (solver, ci, prev, expanded_size, main_dimension, second_dimension, alloc_dimension,
height, width, height, width,
top, bottom, top_padding, bottom_padding, top, bottom, top_padding, bottom_padding,
left, right, left_padding, right_padding); left, right, left_padding, right_padding,
_top_margin, _bottom_margin, _left_margin, _right_margin);
} }
void void
@ -449,5 +457,40 @@ cBox::add_horizontal_box_constraints (kiwi::Solver& solver, BoxConstrainedItem*
add_box_constraints (solver, ci, prev, expanded_size, main_dimension, second_dimension, alloc_dimension, add_box_constraints (solver, ci, prev, expanded_size, main_dimension, second_dimension, alloc_dimension,
width, height, width, height,
left, right, left_padding, right_padding, left, right, left_padding, right_padding,
top, bottom, top_padding, bottom_padding); top, bottom, top_padding, bottom_padding,
_left_margin, _right_margin, _top_margin, _bottom_margin);
}
void
cBox::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{
if (fill() || outline() && _allocation) {
Rect contents = _allocation;
contents.x0 += _left_margin;
contents.x1 -= _right_margin;
contents.y0 += _top_margin;
contents.y1 -= _bottom_margin;
Rect self (item_to_window (contents, false));
const Rect draw = self.intersection (area);
if (fill()) {
setup_fill_context (context);
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
context->fill_preserve ();
}
if (outline()) {
if (!fill()) {
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
}
setup_outline_context (context);
context->stroke ();
}
}
Item::render_children (area, context);
} }