diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-03-17 20:54:03 +0000 |
commit | 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 (patch) | |
tree | 1236e40183b677abf4a2882e4cfe8e0a345eb24d /gtk2_ardour/editor_tempodisplay.cc | |
parent | 19a4b990325577fc949ccd5d5fbad4520eb1df56 (diff) |
merge with 2.0-ongoing @ rev 3147
git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
-rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index e94bb9f642..c9bd50607b 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -190,8 +190,8 @@ Editor::redraw_measures () void Editor::draw_measures () { - if (session == 0 || _show_measures == false - || !current_bbt_points || current_bbt_points->empty()) { + if (session == 0 || _show_measures == false || + !current_bbt_points || current_bbt_points->empty()) { return; } @@ -202,7 +202,7 @@ Editor::draw_measures () time_line_group->lower(1);*/ marker_time_line_group->raise_to_top(); //marker_time_line_group->lower(1); - + /* the cursors are always on top of everything */ cursor_group->raise_to_top(); |