ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Merge branch 'cairocanvas' into windows+cc

Browse Source
This commit is contained in:
John Emmas 2013-09-25 15:52:11 +01:00
commit 17ad0a0b61
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/canvas/canvas.cc
View File

@ -342,17 +342,19 @@ GtkCanvas::enter_leave_items (Duple const & point, int state)
*/
cerr << "E/L: " << items.size() << " to check at " << point << endl;
#ifdef CANVAS_DEBUG
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;
}
#endif
cerr << "------------\n";
for (vector<Item const*>::const_reverse_iterator i = items.rbegin(); i != items.rend(); ++i) {
Item const * new_item = *i;
#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;
#endif
if (new_item->ignore_events()) {
cerr << "continue1\n";
continue;

2
libs/canvas/canvas/debug.h
View File

@ -36,7 +36,7 @@ namespace PBD {
#ifdef CANVAS_DEBUG
#define CANVAS_DEBUG_NAME(i, n) i->name = n;
#else
#define CANVAS_DEBUG(i, n) /* empty */
#define CANVAS_DEBUG_NAME(i, n) /* empty */
#endif
namespace ArdourCanvas {

2
libs/canvas/group.cc
View File

@ -295,6 +295,7 @@ Group::add_items_at_point (Duple const point, vector<Item const *>& items) const
void
Group::dump (ostream& o) const
{
#ifdef CANVAS_DEBUG
o << _canvas->indent();
o << "Group " << this << " [" << name << ']';
o << " @ " << position();
@ -311,6 +312,7 @@ Group::dump (ostream& o) const
}
o << endl;
#endif
ArdourCanvas::dump_depth++;

2
libs/canvas/lookup_table.cc
View File

@ -79,7 +79,7 @@ OptimizingLookupTable::OptimizingLookupTable (Group const & group, int items_per
/* number of cells */
int const cells = items.size() / _items_per_cell;
/* hence number down each side of the table's square */
_dimension = max (1, int (rint (sqrt (cells))));
_dimension = max (1, int (rint (sqrt ((double)cells))));
_cells = new Cell*[_dimension];
for (int i = 0; i < _dimension; ++i) {