summaryrefslogtreecommitdiff
path: root/src/wx/timeline_content_view.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-04 00:51:31 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-04 00:51:31 +0100
commitaaaa51f6d9eda60ab3b3d182c6d2a7a5bda375aa (patch)
tree9a8a1ec74936fb47c4700d34da6e63cd82fe0f84 /src/wx/timeline_content_view.cc
parentbeddaeab9011e745dcac9732f4e8de3f91bd81a5 (diff)
Add zoom-all button.
Diffstat (limited to 'src/wx/timeline_content_view.cc')
-rw-r--r--src/wx/timeline_content_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 1d0c1668f..88b50076a 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -51,7 +51,7 @@ TimelineContentView::bbox () const
time_x (content->position ()),
y_pos (_track.get()),
content->length_after_trim().seconds() * _timeline.pixels_per_second().get_value_or(0),
- _timeline.track_height()
+ _timeline.pixels_per_track()
);
}
@@ -148,7 +148,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
wxDouble name_leading;
gc->SetFont (gc->CreateFont (*wxNORMAL_FONT, foreground_colour ()));
gc->GetTextExtent (name, &name_width, &name_height, &name_descent, &name_leading);
- gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.track_height()));
+ gc->Clip (wxRegion (time_x (position), y_pos (_track.get()), len.seconds() * _timeline.pixels_per_second().get_value_or(0), _timeline.pixels_per_track()));
gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4);
gc->ResetClip ();
}
@@ -156,7 +156,7 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
int
TimelineContentView::y_pos (int t) const
{
- return t * _timeline.track_height() + _timeline.tracks_y_offset();
+ return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
}
void