reduce verbiage and remove visible current_item red rect
This commit is contained in:
parent
f6d33d2a87
commit
006ba7cd36
@ -83,14 +83,6 @@ 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&
|
||||||
@ -327,7 +319,7 @@ GtkCanvas::enter_leave_items (Duple const & point, int state)
|
|||||||
if (items.empty()) {
|
if (items.empty()) {
|
||||||
if (_current_item) {
|
if (_current_item) {
|
||||||
/* leave event */
|
/* leave event */
|
||||||
cerr << "E/L: left item " << _current_item->whatami() << '/' << _current_item->name << " for ... nada" << endl;
|
// cerr << "E/L: left item " << _current_item->whatami() << '/' << _current_item->name << " for ... nada" << endl;
|
||||||
_current_item->Event (reinterpret_cast<GdkEvent*> (&leave_event));
|
_current_item->Event (reinterpret_cast<GdkEvent*> (&leave_event));
|
||||||
_current_item = 0;
|
_current_item = 0;
|
||||||
}
|
}
|
||||||
@ -339,19 +331,19 @@ 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";
|
||||||
@ -483,19 +475,6 @@ GtkCanvas::on_expose_event (GdkEventExpose* ev)
|
|||||||
|
|
||||||
render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), c);
|
render (Rect (ev->area.x, ev->area.y, ev->area.x + ev->area.width, ev->area.y + ev->area.height), c);
|
||||||
|
|
||||||
#if 1
|
|
||||||
if (_current_item) {
|
|
||||||
boost::optional<Rect> orect = _current_item->bounding_box();
|
|
||||||
if (orect) {
|
|
||||||
Rect r = _current_item->item_to_window (orect.get());
|
|
||||||
c->rectangle (r.x0, r.y0, r.x1 - r.x0, r.y1 - r.y0);
|
|
||||||
c->set_source_rgba (1.0, 0.0, 0.0, 1.0);
|
|
||||||
c->stroke ();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user