diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-18 09:02:13 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2016-12-18 09:02:13 -0600 |
| commit | 448f921dd893f58b20683801db6806464520d49f (patch) | |
| tree | 3c8b7d366d633e1e63cadd9f1473abeb8a4ff513 /gtk2_ardour/mini_timeline.cc | |
| parent | 33b1dea98ad84c6652b63c9121fa860cb4b9bd72 (diff) | |
Transport Layout:
* Remove some redundant containers and frames, for a cleaner look.
* Adjust transport button spacing and sizes to more closely match the editor toolbar.
Diffstat (limited to 'gtk2_ardour/mini_timeline.cc')
| -rw-r--r-- | gtk2_ardour/mini_timeline.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc index d050509909..23de27eb3c 100644 --- a/gtk2_ardour/mini_timeline.cc +++ b/gtk2_ardour/mini_timeline.cc @@ -278,6 +278,9 @@ MiniTimeline::draw_mark (cairo_t* cr, int x0, int x1, int h, const std::string& cairo_rectangle (cr, x0, y, rw - x0, h); cairo_set_source_rgba (cr, r, g, b, 0.5); cairo_fill_preserve (cr); + cairo_set_source_rgba (cr, r, g, b, 1.0); + cairo_set_line_width (cr, 1.0); + cairo_stroke_preserve (cr); cairo_clip (cr); // marker label @@ -295,7 +298,7 @@ MiniTimeline::draw_mark (cairo_t* cr, int x0, int x1, int h, const std::string& cairo_rel_line_to (cr, w2, -h1); cairo_rel_line_to (cr, 0, -h0); cairo_close_path (cr); - cairo_set_source_rgba (cr, r, g, b, 1.0); + cairo_set_source_rgba (cr, r, g, b, a); cairo_set_line_width (cr, 1.0); cairo_stroke_preserve (cr); cairo_fill (cr); @@ -384,7 +387,11 @@ MiniTimeline::render (cairo_t* cr, cairo_rectangle_t*) framepos_t lmin = std::max ((framepos_t)0, (p - time_span_samples)); framepos_t lmax = p + time_span_samples; - const int mh = std::min (.4f * get_height(), get_height() - _time_height - 8.f); + int tw, th; + _layout->set_text( X_("Marker@") ); + _layout->get_pixel_size (tw, th); + + const int mh = th + 2; assert (mh > 4); const int mw = (mh - 1) / 4; |