remove global canvas scroll offset, to provide no-scroll-parent == no-scroll behaviour

3 files changed, 4 insertions, 11 deletions

diff --git a/libs/canvas/canvas.cc b/libs/canvas/canvas.cc
index 7742a9fbf8..100cf7eeaa 100644
--- a/libs/canvas/canvas.cc
+++ b/libs/canvas/canvas.cc
@@ -48,8 +48,6 @@ Canvas::Canvas ()
 void
 Canvas::scroll_to (Coord x, Coord y)
 {
-	_scroll_offset = Duple (x, y);
-
 	/* We do things this way because we do not want to recurse through
 	   the canvas for every scroll. In the presence of large MIDI
 	   tracks this means traversing item lists that include
@@ -61,7 +59,7 @@ Canvas::scroll_to (Coord x, Coord y)
 	*/
 
 	for (list<ScrollGroup*>::iterator i = scrollers.begin(); i != scrollers.end(); ++i) {
-		(*i)->scroll_to (_scroll_offset);
+		(*i)->scroll_to (Duple (x, y));
 	}
 
 	pick_current_item (0); // no current mouse position 
@@ -225,9 +223,7 @@ Canvas::window_to_canvas (Duple const & d) const
 		return d.translate (sg->scroll_offset());
 	}
 
-	/* fallback to global canvas offset ... it would be nice to remove this */
-
-	return d.translate (_scroll_offset);
+	return d;
 }
 
 Duple
@@ -252,7 +248,7 @@ Canvas::canvas_to_window (Duple const & d, bool rounded) const
 	if (sg) {
 		wd = d.translate (-sg->scroll_offset());
 	} else {
-		wd = d.translate (-_scroll_offset);
+		wd = d;
 	}
 
 	/* Note that this intentionally almost always returns integer coordinates */
diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h
index ae80f44118..fac9367985 100644
--- a/libs/canvas/canvas/canvas.h
+++ b/libs/canvas/canvas/canvas.h
@@ -107,7 +107,6 @@ public:
         }
 
         void scroll_to (Coord x, Coord y);
-	Duple scroll_offset() const { return _scroll_offset; }
 	void add_scroller (ScrollGroup& i);
         
         virtual Rect  visible_area () const = 0;
@@ -126,8 +125,6 @@ protected:
 	/** our root group */
 	RootGroup _root;
 
-        Duple _scroll_offset;
-
         virtual void pick_current_item (int state) = 0;
         virtual void pick_current_item (Duple const &, int state) = 0;
 
diff --git a/libs/canvas/item.cc b/libs/canvas/item.cc
index 620343493f..2bca2feac2 100644
--- a/libs/canvas/item.cc
+++ b/libs/canvas/item.cc
@@ -114,7 +114,7 @@ Item::scroll_offset () const
 	if (_scroll_parent) {
 		return _scroll_parent->scroll_offset();
 	} 
-	return _canvas->scroll_offset();
+	return Duple (0,0);
 }
 
 Duple