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

expand bounding box of all objects by 0.5 before computing intersection for render cycle; alter debug output

Browse source
This commit is contained in:
Paul Davis 2013-10-24 17:14:12 -04:00
parent c21ed2b877
commit c3f1369cfd
2 changed files with 28 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
libs/canvas/canvas.cc
View file

@ -83,6 +83,13 @@ Canvas::render (Rect const & area, Cairo::RefPtr<Cairo::Context> const & context
_root.render (*draw, context); _root.render (*draw, context);
} }
#if 0
/* debug render area */
Rect r = _root.item_to_window (area);
context->rectangle (r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
context->set_source_rgba (1.0, 0.0, 0.0, 1.0);
context->stroke ();
#endif
} }
ostream& ostream&
@ -205,11 +212,11 @@ Canvas::item_moved (Item* item, boost::optional<Rect> pre_change_parent_bounding
* to be in parent coordinate space since the bounding box of * to be in parent coordinate space since the bounding box of
* an item does not change when moved. If we use * an item does not change when moved. If we use
* item->item_to_canvas() on the old bounding box, we will be * item->item_to_canvas() on the old bounding box, we will be
* using the item's new position, and so will compute the wrong * using the item's new position, and so will compute the wrong
* invalidation area. If we use the parent (which has not * invalidation area. If we use the parent (which has not
* moved, then this will work. * moved, then this will work.
*/ */
queue_draw_item_area (item->parent(), pre_change_parent_bounding_box.get ()); queue_draw_item_area (item->parent(), pre_change_parent_bounding_box.get ());
} }
@ -341,27 +348,27 @@ GtkCanvas::enter_leave_items (Duple const & point, int state)
* we have entered it * we have entered it
*/ */
cerr << "E/L: " << items.size() << " to check at " << point << endl; //cerr << "E/L: " << items.size() << " to check at " << point << endl;
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
for (vector<Item const*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) { for (vector<Item const*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) {
cerr << '\t' << (*i)->whatami() << ' ' << (*i)->name << " ignore ? " << (*i)->ignore_events() << " current ? " << (_current_item == (*i)) << endl; //cerr << '\t' << (*i)->whatami() << ' ' << (*i)->name << " ignore ? " << (*i)->ignore_events() << " current ? " << (_current_item == (*i)) << endl;
} }
#endif #endif
cerr << "------------\n"; //cerr << "------------\n";
for (vector<Item const*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) { for (vector<Item const*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) {
Item const * new_item = *i; Item const * new_item = *i;
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
cerr << "\tE/L check out " << new_item->whatami() << ' ' << new_item->name << " ignore ? " << new_item->ignore_events() << " current ? " << (_current_item == new_item) << endl; //cerr << "\tE/L check out " << new_item->whatami() << ' ' << new_item->name << " ignore ? " << new_item->ignore_events() << " current ? " << (_current_item == new_item) << endl;
#endif #endif
if (new_item->ignore_events()) { if (new_item->ignore_events()) {
cerr << "continue1\n"; //cerr << "continue1\n";
continue; continue;
} }
if (_current_item == new_item) { if (_current_item == new_item) {
cerr << "continue2\n"; //cerr << "continue2\n";
continue; continue;
} }
@ -379,7 +386,7 @@ GtkCanvas::enter_leave_items (Duple const & point, int state)
break; break;
} }
cerr << "Loop around again\n"; //cerr << "Loop around again\n";
} }
} }

15
libs/canvas/group.cc
View file

@ -88,7 +88,7 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
if (!(*i)->visible ()) { if (!(*i)->visible ()) {
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) { if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) {
// cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << " [" << (*i)->name << "] invisible - skipped\n"; cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << " [" << (*i)->name << "] invisible - skipped\n";
} }
#endif #endif
continue; continue;
@ -106,13 +106,22 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
} }
Rect item = (*i)->item_to_window (item_bbox.get()); Rect item = (*i)->item_to_window (item_bbox.get());
item.expand (0.5);
boost::optional<Rect> draw = item.intersection (area); boost::optional<Rect> draw = item.intersection (area);
if (draw) { if (draw) {
#ifdef CANVAS_DEBUG #ifdef CANVAS_DEBUG
if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) { if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) {
cerr << string_compose ("%1render %2 %3 item = %4 intersect = %5\n", _canvas->render_indent(), (*i)->whatami(), cerr << _canvas->render_indent() << " render "
(*i)->name, item, draw.get()); << ' '
<< (*i)->whatami()
<< ' '
<< (*i)->name
<< " item = "
<< item
<< " intersect = "
<< draw.get()
<< endl;
} }
#endif #endif