summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2022-11-21 00:24:31 +0100
committerCarl Hetherington <cth@carlh.net>2022-11-21 00:24:31 +0100
commit4d8f96e15edb4807cc9773cc7f9eb6aa56ac2dc8 (patch)
tree7b534e00479877732601b6e7543b70a651557f55 /src
parentef25237193100de106eccdb8f40524fa670bda76 (diff)
Move y_pos to TimelineView.
Diffstat (limited to 'src')
-rw-r--r--src/wx/timeline_content_view.cc7
-rw-r--r--src/wx/timeline_content_view.h1
-rw-r--r--src/wx/timeline_view.cc9
-rw-r--r--src/wx/timeline_view.h1
4 files changed, 10 insertions, 8 deletions
diff --git a/src/wx/timeline_content_view.cc b/src/wx/timeline_content_view.cc
index 633110c18..5d039d0d3 100644
--- a/src/wx/timeline_content_view.cc
+++ b/src/wx/timeline_content_view.cc
@@ -171,13 +171,6 @@ TimelineContentView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>>
}
-int
-TimelineContentView::y_pos (int t) const
-{
- return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
-}
-
-
void
TimelineContentView::content_change (ChangeType type, int p)
{
diff --git a/src/wx/timeline_content_view.h b/src/wx/timeline_content_view.h
index 48ca6ed79..aa9832e5d 100644
--- a/src/wx/timeline_content_view.h
+++ b/src/wx/timeline_content_view.h
@@ -64,7 +64,6 @@ protected:
private:
void do_paint (wxGraphicsContext* gc, std::list<dcpomatic::Rect<int>> overlaps) override;
- int y_pos (int t) const;
void content_change (ChangeType type, int p);
boost::optional<int> _track;
diff --git a/src/wx/timeline_view.cc b/src/wx/timeline_view.cc
index 10d6dc5be..2897c98e3 100644
--- a/src/wx/timeline_view.cc
+++ b/src/wx/timeline_view.cc
@@ -58,3 +58,12 @@ TimelineView::time_x (DCPTime t) const
{
return t.seconds() * _timeline.pixels_per_second().get_value_or(0);
}
+
+
+int
+TimelineView::y_pos(int t) const
+{
+ return t * _timeline.pixels_per_track() + _timeline.tracks_y_offset();
+}
+
+
diff --git a/src/wx/timeline_view.h b/src/wx/timeline_view.h
index f3aa4d5e6..166a1121a 100644
--- a/src/wx/timeline_view.h
+++ b/src/wx/timeline_view.h
@@ -52,6 +52,7 @@ protected:
virtual void do_paint (wxGraphicsContext *, std::list<dcpomatic::Rect<int>> overlaps) = 0;
int time_x (dcpomatic::DCPTime t) const;
+ int y_pos(int t) const;
Timeline& _timeline;