projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix TimelineTimeAxisView::bbox() to be correct.
[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 046ddaf3f2b301f7f4495cc2dd18e7d451465d34..d055bda7d54bfb310e338f1fcd2b2112cc64ad51 100644
(file)
--- a/
src/wx/timeline_time_axis_view.cc
+++ b/
src/wx/timeline_time_axis_view.cc
@@
-18,14
+18,15
@@
*/
*/
+
#include "timeline.h"
#include "timeline_time_axis_view.h"
#include "wx_util.h"
#include "timeline.h"
#include "timeline_time_axis_view.h"
#include "wx_util.h"
-#include
"lib/warnings.h"
-
DCPOMATIC
_DISABLE_WARNINGS
+#include
<dcp/warnings.h>
+
LIBDCP
_DISABLE_WARNINGS
#include <wx/graphics.h>
#include <wx/wx.h>
#include <wx/graphics.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
using std::cout;
using std::cout;
@@
-44,7
+45,7
@@
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
);
}
}
@@
-66,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));
@@
-77,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;