ardour/livetrax
13
0
Fork 0
Code

ScrollGroups are kept in their own list, so ::window_to_canvas() does not need to inspect root group children to find them

Browse Source 
Conflicts:
	libs/canvas/canvas.cc
This commit is contained in:
Paul Davis 2015-01-24 14:07:36 -05:00
parent db28eefc49
commit e84e1f7403
1 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libs/canvas/canvas.cc
View File

@ -230,13 +230,8 @@ Canvas::item_changed (Item* item, boost::optional<Rect> pre_change_bounding_box)
Duple
Canvas::window_to_canvas (Duple const & d) const
{
/* Find the scroll group that covers d (a window coordinate). Scroll groups are only allowed
* as children of the root group, so we just scan its first level
* children and see what we can find.
*/
std::list<Item*> const& root_children (_root.items());
ScrollGroup* best_group = 0;
ScrollGroup* sg = 0;
/* if the coordinates are negative, clamp to zero and find the item
* that covers that "edge" position.
@ -251,11 +246,22 @@ Canvas::window_to_canvas (Duple const & d) const
in_window.y = 0;
}
for (std::list<Item*>::const_reverse_iterator i = root_children.rbegin(); i != root_children.rend(); ++i) {
ScrollGroup* sg = dynamic_cast<ScrollGroup*>(*i);
for (list<ScrollGroup*>::const_iterator s = scrollers.begin(); s != scrollers.end(); ++s) {
if ((*s)->covers_window (in_window)) {
sg = *s;
/* XXX January 22nd 2015: leaving this in place for now
* but I think it fixes a bug that really should be
* fixed in a different way (and will be) by my next
* commit. But it may still be relevant.
*/
/* If scroll groups overlap, choose the one with the highest sensitivity,
that is, choose an HV scroll group over an H or V only group. */
if (sg && (!best_group || sg->sensitivity() > best_group->sensitivity())) {
that is, choose an HV scroll group over an H or V
only group.
*/
if (!best_group || sg->sensitivity() > best_group->sensitivity()) {
best_group = sg;
if (sg->sensitivity() == (ScrollGroup::ScrollsVertically | ScrollGroup::ScrollsHorizontally)) {
/* Can't do any better than this. */
@ -263,6 +269,7 @@ Canvas::window_to_canvas (Duple const & d) const
}
}
}
}
if (best_group) {
return d.translate (best_group->scroll_offset());
@ -289,7 +296,6 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const
}
}
if (sg) {
wd = d.translate (-sg->scroll_offset());
} else {