ardour/livetrax
13
0
Fork 0
Code

Canvas: partially improve/fix cBox rendering

Browse Source
This commit is contained in:
Paul Davis 2020-06-24 18:13:19 -06:00
parent 2598bdef2c
commit 815eb82882
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libs/canvas/cbox.cc
View File

@ -464,20 +464,35 @@ cBox::add_horizontal_box_constraints (kiwi::Solver& solver, BoxConstrainedItem*
void void
cBox::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const cBox::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
{ {
cerr << whoami() << " render f " << fill() << " o " << outline() << " a " << _allocation << endl;
if (fill() || outline() && _allocation) { if (fill() || outline() && _allocation) {
Rect contents = _allocation; Rect contents = _allocation;
contents.x0 += _left_margin; /* allocation will have been left with (x0,y0) as given by the
contents.x1 -= _right_margin; * parent, but _position is set to the same value and will
contents.y0 += _top_margin; * be taken into account by item_to_window()
contents.y1 -= _bottom_margin; */
double width = contents.width() - (_left_margin + _top_margin);
double height = contents.height() - (_top_margin + _bottom_margin);
contents.x0 = _left_margin;
contents.y0 = _top_margin;
contents.x1 = contents.x0 + width;
contents.y1 = contents.y0 + height;
cerr << whoami() << " !!! RI !!! " << width << " x " << height << " @ " << contents.x0 << ", " << contents.y0 << " marg " << _top_margin << endl;
Rect self (item_to_window (contents, false)); Rect self (item_to_window (contents, false));
const Rect draw = self.intersection (area); const Rect draw = self.intersection (area);
if (fill()) { if (fill()) {
cerr << whoami() << " will fill " << draw << " from contents = " << contents << " from " << _allocation << " self was " << self << " area " << area << endl;
setup_fill_context (context); setup_fill_context (context);
context->rectangle (draw.x0, draw.y0, draw.width(), draw.height()); context->rectangle (draw.x0, draw.y0, draw.width(), draw.height());
context->fill_preserve (); context->fill_preserve ();