diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-06-21 01:15:32 +0100 |
| commit | e60bb3e51bd1508b149e6b8f6608f09b5196ae26 (patch) | |
| tree | a7a5b937c9ae138d4eebca8d5130d308bf9ae420 /src/wx/timeline_content_view.cc | |
| parent | f07d5125a7b609320682689abe40781f096ca25e (diff) | |
No-op: remove all trailing whitespace.
Diffstat (limited to 'src/wx/timeline_content_view.cc')
| -rw-r--r-- | src/wx/timeline_content_view.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc index b72ba48c8..df0772be9 100644 --- a/src/wx/timeline_content_view.cc +++ b/src/wx/timeline_content_view.cc @@ -37,13 +37,13 @@ dcpomatic::Rect<int> TimelineContentView::bbox () const { DCPOMATIC_ASSERT (_track); - + shared_ptr<const Film> film = _timeline.film (); shared_ptr<const Content> content = _content.lock (); if (!film || !content) { return dcpomatic::Rect<int> (); } - + return dcpomatic::Rect<int> ( time_x (content->position ()) - 8, y_pos (_track.get()) - 8, @@ -93,18 +93,18 @@ void TimelineContentView::do_paint (wxGraphicsContext* gc) { DCPOMATIC_ASSERT (_track); - + shared_ptr<const Film> film = _timeline.film (); shared_ptr<const Content> cont = content (); if (!film || !cont) { return; } - + DCPTime const position = cont->position (); DCPTime const len = cont->length_after_trim (); - + wxColour selected (background_colour().Red() / 2, background_colour().Green() / 2, background_colour().Blue() / 2); - + gc->SetPen (*wxThePenList->FindOrCreatePen (foreground_colour(), 4, wxPENSTYLE_SOLID)); if (_selected) { gc->SetBrush (*wxTheBrushList->FindOrCreateBrush (selected, wxBRUSHSTYLE_SOLID)); @@ -120,14 +120,14 @@ TimelineContentView::do_paint (wxGraphicsContext* gc) path.AddLineToPoint (time_x (position), y_pos (_track.get()) + 4); gc->StrokePath (path); gc->FillPath (path); - + wxString name = wxString::Format (wxT ("%s [%s]"), std_to_wx (cont->summary()).data(), type().data()); wxDouble name_width; wxDouble name_height; wxDouble name_descent; wxDouble name_leading; 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->SetFont (gc->CreateFont (*wxNORMAL_FONT, foreground_colour ())); gc->DrawText (name, time_x (position) + 12, y_pos (_track.get() + 1) - name_height - 4); @@ -144,11 +144,11 @@ void TimelineContentView::content_changed (int p, bool frequent) { ensure_ui_thread (); - + if (p == ContentProperty::POSITION || p == ContentProperty::LENGTH) { force_redraw (); } - + if (!frequent) { _timeline.setup_pixels_per_second (); _timeline.Refresh (); |
