ardour/livetrax
13
0
Fork 0
Code

Revert "Kludgey fix for invisible playhead when scrolled."

Browse Source 
This reverts commit 8f823388d9.
This commit is contained in:
David Robillard 2015-01-16 22:06:10 -05:00
parent fc70b5a9f9
commit a58730e8f9
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_canvas.cc
View File

@ -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);

5
libs/canvas/canvas/scroll_group.h
View File

@ -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;
};
}

14
libs/canvas/scroll_group.cc
View File

@ -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,