summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-04-10 14:42:36 -0400
committerPaul Davis <paul@linuxaudiosystems.com>2013-04-10 14:42:36 -0400
commit204da61f98906ef737b4e32b467cb2857622a711 (patch)
tree34ae16f18037ea237c3aa9b66e636f87fb8bdb58 /libs
parent9a8ee11f6532c73320f76b10aabec68081c9ebf4 (diff)
remove incorrect merge of cairocanvas patch that stopped most tracks from displaying; add more debugging info
Diffstat (limited to 'libs')
-rw-r--r--libs/canvas/canvas/group.h2
-rw-r--r--libs/canvas/canvas/item.h2
-rw-r--r--libs/canvas/group.cc5
3 files changed, 5 insertions, 4 deletions
diff --git a/libs/canvas/canvas/group.h b/libs/canvas/canvas/group.h
index 89d566b6ed..ee50f649f3 100644
--- a/libs/canvas/canvas/group.h
+++ b/libs/canvas/canvas/group.h
@@ -26,7 +26,7 @@ public:
std::list<Item*> const & items () const {
return _items;
}
-
+
void raise_child_to_top (Item *);
void raise_child (Item *, int);
void lower_child_to_bottom (Item *);
diff --git a/libs/canvas/canvas/item.h b/libs/canvas/canvas/item.h
index a440573731..fc66754ed4 100644
--- a/libs/canvas/canvas/item.h
+++ b/libs/canvas/canvas/item.h
@@ -116,7 +116,7 @@ public:
void raise (int);
void lower_to_bottom ();
- void hide ();
+ void hide ();
void show ();
/** @return true if this item is visible (ie it will be rendered),
diff --git a/libs/canvas/group.cc b/libs/canvas/group.cc
index a6ddec52bc..7ed0f72f74 100644
--- a/libs/canvas/group.cc
+++ b/libs/canvas/group.cc
@@ -71,7 +71,7 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
if (!(*i)->visible ()) {
#ifdef CANVAS_DEBUG
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
continue;
@@ -82,7 +82,7 @@ Group::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) const
if (!item_bbox) {
#ifdef CANVAS_DEBUG
if (DEBUG_ENABLED(PBD::DEBUG::CanvasRender)) {
- cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << ' ' << (*i)->name << " empty - skipped\n";
+ cerr << _canvas->render_indent() << "Item " << (*i)->whatami() << " [" << (*i)->name << "] empty - skipped\n";
}
#endif
continue;
@@ -279,6 +279,7 @@ Group::dump (ostream& o) const
o << _canvas->indent();
o << "Group " << this;
o << " Items: " << _items.size();
+ o << " Visible ? " << _visible;
boost::optional<Rect> bb = bounding_box();