X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fcanvas%2Frectangle.cc;h=bc4ad0c9609862e34903d251a6b2fe458d33af65;hb=0622a0cc3068a06d328119e90b7d9c5f5a84df32;hp=a5aa0a2895852dc4b46c4a9988a0e21254627ea2;hpb=fd23ebd0886cd61f8ee68d52d6576d00a16c9032;p=ardour.git diff --git a/libs/canvas/rectangle.cc b/libs/canvas/rectangle.cc index a5aa0a2895..bc4ad0c960 100644 --- a/libs/canvas/rectangle.cc +++ b/libs/canvas/rectangle.cc @@ -30,80 +30,98 @@ using namespace std; using namespace ArdourCanvas; -Rectangle::Rectangle (Group* parent) - : Item (parent) - , Outline (parent) - , Fill (parent) +Rectangle::Rectangle (Canvas* c) + : Item (c) , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM)) { +} +Rectangle::Rectangle (Canvas* c, Rect const & rect) + : Item (c) + , _rect (rect) + , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM)) +{ +} + +Rectangle::Rectangle (Item* parent) + : Item (parent) + , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM)) +{ } -Rectangle::Rectangle (Group* parent, Rect const & rect) +Rectangle::Rectangle (Item* parent, Rect const & rect) : Item (parent) - , Outline (parent) - , Fill (parent) , _rect (rect) , _outline_what ((What) (LEFT | RIGHT | TOP | BOTTOM)) { - } void Rectangle::render (Rect const & area, Cairo::RefPtr context) const { - Rect self = item_to_window (_rect); - boost::optional d = self.intersection (area); + /* In general, a Rectangle will have a _position of (0,0) within its + parent, and its extent is actually defined by _rect. But in the + unusual case that _position is set to something other than (0,0), + we should take that into account when rendering. + */ + Rect self = item_to_window (_rect.translate (_position)); + boost::optional r = self.intersection (area); - if (!d) { + if (!r) { return; } - - Rect draw = d.get(); - static const double boundary = 0.5; - const double x_limit = _canvas->visible_area().width(); - - draw.x0 = max (self.x0, max (0.0, draw.x0 - boundary)); - draw.x1 = min (self.x1, min (x_limit, draw.x1 + boundary)); - draw.y0 = max (self.y0, max (0.0, draw.y0 - boundary)); - draw.y1 = min (self.y1, min (x_limit, draw.y1 + boundary)); + Rect draw = r.get (); - Rect fill_rect = draw; - Rect stroke_rect = fill_rect.expand (0.5); - - if (_fill) { + if (_fill && !_transparent) { if (_stops.empty()) { setup_fill_context (context); } else { setup_gradient_context (context, self, Duple (draw.x0, draw.y0)); } - context->rectangle (fill_rect.x0, fill_rect.y0, fill_rect.width(), fill_rect.height()); + + context->rectangle (draw.x0, draw.y0, draw.width(), draw.height()); context->fill (); - } + } if (_outline) { setup_outline_context (context); - - if (_outline_what & LEFT) { - context->move_to (stroke_rect.x0, stroke_rect.y0); - context->line_to (stroke_rect.x0, stroke_rect.y1); - } - - if (_outline_what & BOTTOM) { - context->move_to (stroke_rect.x0, stroke_rect.y1); - context->line_to (stroke_rect.x1, stroke_rect.y1); - } - - if (_outline_what & RIGHT) { - context->move_to (stroke_rect.x1, stroke_rect.y0); - context->line_to (stroke_rect.x1, stroke_rect.y1); - } - if (_outline_what & TOP) { - context->move_to (stroke_rect.x0, stroke_rect.y0); - context->line_to (stroke_rect.x1, stroke_rect.y0); + /* see the cairo FAQ on single pixel lines to see why we do + * the 0.5 pixel additions. + */ + + if (_outline_what == What (LEFT|RIGHT|BOTTOM|TOP)) { + + context->rectangle (self.x0 + 0.5, self.y0 + 0.5, self.width() - 1.0, self.height() - 1.0); + + } else { + + if (_outline_what & LEFT) { + /* vertical line: move x-coordinate by 0.5 pixels */ + context->move_to (self.x0 + 0.5, self.y0); + context->line_to (self.x0 + 0.5, self.y1); + } + + if (_outline_what & TOP) { + /* horizontal line: move y-coordinate by 0.5 pixels */ + context->move_to (self.x0, self.y0 + 0.5); + context->line_to (self.x1, self.y0 + 0.5); + } + + if (_outline_what & BOTTOM) { + /* horizontal line: move y-coordinate by 0.5 pixels */ + context->move_to (self.x0, self.y1 - 0.5); + context->line_to (self.x1, self.y1 - 0.5); + } + + if (_outline_what & RIGHT) { + /* vertical line: move x-coordinate by 0.5 pixels */ + context->move_to (self.x1 + 0.5, self.y0); + context->line_to (self.x1 + 0.5, self.y1); + } + } context->stroke (); @@ -113,9 +131,18 @@ Rectangle::render (Rect const & area, Cairo::RefPtr context) con void Rectangle::compute_bounding_box () const { - Rect r = _rect.fix (); - _bounding_box = boost::optional (r.expand (_outline_width / 2)); - + if (!_rect.empty()) { + Rect r = _rect.fix (); + /* take into acount the 0.5 addition to the bounding + box for the right and bottom edges, see ::render() above + */ + + r.x1 += 1.0; // XXX this makes no sense but is necessary + r.y1 += 0.5; + + _bounding_box = r; + } + _bounding_box_dirty = false; } @@ -125,82 +152,77 @@ Rectangle::set (Rect const & r) /* We don't update the bounding box here; it's just as cheap to do it when asked. */ - - begin_change (); - - _rect = r; - - _bounding_box_dirty = true; - end_change (); - DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (set)\n"); + if (r != _rect) { + + begin_change (); + + _rect = r; + + _bounding_box_dirty = true; + end_change (); + } } void Rectangle::set_x0 (Coord x0) { - begin_change (); - - _rect.x0 = x0; - - _bounding_box_dirty = true; - end_change (); - - DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (x0)\n"); + if (x0 != _rect.x0) { + begin_change (); + + _rect.x0 = x0; + + _bounding_box_dirty = true; + end_change (); + } } void Rectangle::set_y0 (Coord y0) { - begin_change (); - - _rect.y0 = y0; - - _bounding_box_dirty = true; - end_change(); - - DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (y0)\n"); + if (y0 != _rect.y0) { + begin_change (); + + _rect.y0 = y0; + + _bounding_box_dirty = true; + end_change(); + } } void Rectangle::set_x1 (Coord x1) { - begin_change (); - - _rect.x1 = x1; - - _bounding_box_dirty = true; - end_change (); - - DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (x1)\n"); + if (x1 != _rect.x1) { + begin_change (); + + _rect.x1 = x1; + + _bounding_box_dirty = true; + end_change (); + } } void Rectangle::set_y1 (Coord y1) { - begin_change (); - - _rect.y1 = y1; - - _bounding_box_dirty = true; - end_change (); - - DEBUG_TRACE (PBD::DEBUG::CanvasItemsDirtied, "canvas item dirty: rectangle change (y1)\n"); + if (y1 != _rect.y1) { + begin_change (); + + _rect.y1 = y1; + + _bounding_box_dirty = true; + end_change (); + } } void Rectangle::set_outline_what (What what) { - begin_change (); - - _outline_what = what; - - end_change (); -} - -void -Rectangle::set_outline_what (int what) -{ - set_outline_what ((What) what); + if (what != _outline_what) { + begin_visual_change (); + _outline_what = what; + end_visual_change (); + } }