projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: remove unused include.
[dcpomatic.git]
/
src
/
wx
/
timeline_time_axis_view.cc
diff --git
a/src/wx/timeline_time_axis_view.cc
b/src/wx/timeline_time_axis_view.cc
index e9de1b542fab6b1777993b09a920009d420903bc..d055bda7d54bfb310e338f1fcd2b2112cc64ad51 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-18,16
+18,22
@@
*/
*/
-#include "timeline_time_axis_view.h"
+
#include "timeline.h"
#include "timeline.h"
+#include "timeline_time_axis_view.h"
#include "wx_util.h"
#include "wx_util.h"
-#include <wx/wx.h>
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/graphics.h>
+#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
+
-using std::list;
using std::cout;
using std::cout;
+using std::list;
using namespace dcpomatic;
using namespace dcpomatic;
+
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
, _y (y)
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
: TimelineView (tl)
, _y (y)
@@
-35,12
+41,14
@@
TimelineTimeAxisView::TimelineTimeAxisView (Timeline& tl, int y)
}
}
+
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
dcpomatic::Rect<int>
TimelineTimeAxisView::bbox () const
{
- return dcpomatic::Rect<int>
(0, _y - 4, _timeline.width(), 24
);
+ return dcpomatic::Rect<int>
(0, y_pos(_y), _timeline.width(), 48
);
}
}
+
/** @param y y position in tracks (not pixels) */
void
TimelineTimeAxisView::set_y (int y)
/** @param y y position in tracks (not pixels) */
void
TimelineTimeAxisView::set_y (int y)
@@
-49,6
+57,7
@@
TimelineTimeAxisView::set_y (int y)
force_redraw ();
}
force_redraw ();
}
+
void
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
{
void
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int> >)
{
@@
-58,7
+67,8
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
double const pps = _timeline.pixels_per_second().get ();
double const pps = _timeline.pixels_per_second().get ();
- gc->SetPen (*wxThePenList->FindOrCreatePen (wxColour (0, 0, 0), 1, wxPENSTYLE_SOLID));
+ wxColour const colour = gui_is_dark() ? *wxWHITE : *wxBLACK;
+ gc->SetPen(*wxThePenList->FindOrCreatePen(colour, 1, wxPENSTYLE_SOLID));
double const mark_interval = calculate_mark_interval (rint (128 / pps));
double const mark_interval = calculate_mark_interval (rint (128 / pps));
@@
-69,7
+79,7
@@
TimelineTimeAxisView::do_paint (wxGraphicsContext* gc, list<dcpomatic::Rect<int>
path.AddLineToPoint (_timeline.width(), y);
gc->StrokePath (path);
path.AddLineToPoint (_timeline.width(), y);
gc->StrokePath (path);
- gc->SetFont
(gc->CreateFont (*wxNORMAL_FONT
));
+ gc->SetFont
(gc->CreateFont(*wxNORMAL_FONT, colour
));
/* Time in seconds */
DCPTime t;
/* Time in seconds */
DCPTime t;