diff options
| author | David Robillard <d@drobilla.net> | 2006-08-12 19:43:09 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-08-12 19:43:09 +0000 |
| commit | a98a67120eea8ebb817eebea048affc182ea054e (patch) | |
| tree | 2c8c9db7c0d8d18bf5185e10d471d6daa7a7de3d /gtk2_ardour/region_view.cc | |
| parent | 30ab1fd61569f9d7fb7410d483fa68cbf9865c37 (diff) | |
Merged with trunk R795
Fiddled with scrolling to leave a bit of context on each side. 'scroll interval' is a single float, should make it a configuration variable some day
git-svn-id: svn://localhost/ardour2/branches/midi@796 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/region_view.cc')
| -rw-r--r-- | gtk2_ardour/region_view.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index db8f345574..68676fe85c 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -111,10 +111,14 @@ RegionView::init (Gdk::Color& basic_color, bool wfd) compute_colors (basic_color); name_highlight->set_data ("regionview", this); - name_text->set_data ("regionview", this); + + if (name_text) { + name_text->set_data ("regionview", this); + } /* an equilateral triangle */ - ArdourCanvas::Points shape; + + ArdourCanvas::Points shape; shape.push_back (Gnome::Art::Point (-((sync_mark_width-1)/2), 1)); shape.push_back (Gnome::Art::Point ((sync_mark_width - 1)/2, 1)); shape.push_back (Gnome::Art::Point (0, sync_mark_width - 1)); |