smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 18:16:35 +01:00
Code Issues Projects Releases Wiki Activity

Cleanups and a few comments.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@4374 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-01-02 00:17:55 +00:00
parent 69ed2a3c27
commit 042997e5ed
28 changed files with 342 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/editor_ops.cc
View file

@ -5340,11 +5340,11 @@ Editor::ensure_track_visible(TimeAxisView *track)
if (track->hidden())
return;
double current_view_min_y = vertical_adjustment.get_value();
double current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize;
double const current_view_min_y = vertical_adjustment.get_value();
double const current_view_max_y = vertical_adjustment.get_value() + vertical_adjustment.get_page_size() - canvas_timebars_vsize;
double track_min_y = track->y_position;
double track_max_y = track->y_position + (double)track->effective_height;
double const track_min_y = track->y_position ();
double const track_max_y = track->y_position () + track->effective_height ();
if (track_min_y >= current_view_min_y &&
track_max_y <= current_view_max_y) {
@ -5358,7 +5358,7 @@ Editor::ensure_track_visible(TimeAxisView *track)
new_value = track_min_y;
} else {
// Track is below the current view
new_value = track->y_position + (double)track->effective_height + canvas_timebars_vsize - vertical_adjustment.get_page_size();
new_value = track->y_position () + track->effective_height() + canvas_timebars_vsize - vertical_adjustment.get_page_size();
}
vertical_adjustment.set_value(new_value);
@ -6216,7 +6216,7 @@ Editor::fit_tracks ()
continue;
}
child_heights += ((*t)->effective_height - (*t)->current_height());
child_heights += (*t)->effective_height() - (*t)->current_height();
}
uint32_t h = (uint32_t) floor ((canvas_height - child_heights - canvas_timebars_vsize)/selection->tracks.size());
@ -6251,7 +6251,7 @@ Editor::fit_tracks ()
if (is_selected) {
(*t)->set_height (h);
first_y_pos = std::min ((*t)->y_position, first_y_pos);
first_y_pos = std::min ((*t)->y_position (), first_y_pos);
} else {
if (prev_was_selected && next_is_selected) {
hide_track_in_display (**t);