Revert "Kludgey fix for invisible playhead when scrolled."

This reverts commit 8f823388d9bd5aa8e297ab05be8c9fb323518945.

3 files changed, 5 insertions, 16 deletions

diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc
index 2e2231c09f..611d5ac054 100644
--- a/gtk2_ardour/editor_canvas.cc
+++ b/gtk2_ardour/editor_canvas.cc
@@ -92,7 +92,7 @@ Editor::initialize_canvas ()
 	CANVAS_DEBUG_NAME (hv_scroll_group, "canvas hv scroll");
 	_track_canvas->add_scroller (*hsg);
 
-	cursor_scroll_group = cg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally, false);
+	cursor_scroll_group = cg = new ArdourCanvas::ScrollGroup (_track_canvas->root(), ArdourCanvas::ScrollGroup::ScrollsHorizontally);
 	CANVAS_DEBUG_NAME (cursor_scroll_group, "canvas cursor scroll");
 	_track_canvas->add_scroller (*cg);
 
diff --git a/libs/canvas/canvas/scroll_group.h b/libs/canvas/canvas/scroll_group.h
index 86bbf9821b..fd9b2388d4 100644
--- a/libs/canvas/canvas/scroll_group.h
+++ b/libs/canvas/canvas/scroll_group.h
@@ -35,8 +35,8 @@ class LIBCANVAS_API ScrollGroup : public Container
 		ScrollsHorizontally = 0x2
 	};
 	
-	ScrollGroup (Canvas*, ScrollSensitivity, bool clip=true);
-	ScrollGroup (Item*, ScrollSensitivity, bool clip=true);
+	ScrollGroup (Canvas*, ScrollSensitivity);
+	ScrollGroup (Item*, ScrollSensitivity);
 
 	void scroll_to (Duple const& d);
 	Duple scroll_offset() const { return _scroll_offset; }
@@ -51,7 +51,6 @@ class LIBCANVAS_API ScrollGroup : public Container
   private:
 	ScrollSensitivity _scroll_sensitivity;
 	Duple             _scroll_offset;
-	bool              _clip;
 };
 
 }
diff --git a/libs/canvas/scroll_group.cc b/libs/canvas/scroll_group.cc
index ad3731116a..1562643b4a 100644
--- a/libs/canvas/scroll_group.cc
+++ b/libs/canvas/scroll_group.cc
@@ -27,17 +27,15 @@
 using namespace std;
 using namespace ArdourCanvas;
 
-ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s, bool clip)
+ScrollGroup::ScrollGroup (Canvas* c, ScrollSensitivity s)
 	: Container (c)
 	, _scroll_sensitivity (s)	
-	, _clip(clip)
 {
 }
 
-ScrollGroup::ScrollGroup (Item* parent, ScrollSensitivity s, bool clip)
+ScrollGroup::ScrollGroup (Item* parent, ScrollSensitivity s)
 	: Container (parent)
 	, _scroll_sensitivity (s)	
-	, _clip(clip)
 {
 }
 
@@ -54,14 +52,6 @@ ScrollGroup::render (Rect const & area, Cairo::RefPtr<Cairo::Context> context) c
 		return;
 	}
 
-	if (!_clip) {
-		/* kludge: clip disabled, because for some reason the cursor scroll
-		   group requires scroll offsets here to clip correctly yet everything
-		   else does not.  I can't figure this out, so since not clipping a
-		   single arrow isn't the end of the world, just don't clip. */
-		Container::render (area, context);
-	}
-
 	Rect self (_position.x + r.get().x0,
 	           _position.y + r.get().y0,
 	           _position.x + r.get().x1,