From c59c46a70ab3458f8fd33e243b586e384a2fc114 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 8 Jan 2020 04:15:18 +0100 Subject: [PATCH] Mini-timeline, use explicit cairo-group to consolidate rendering --- gtk2_ardour/mini_timeline.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/mini_timeline.cc b/gtk2_ardour/mini_timeline.cc index 916007a892..cbda9d052d 100644 --- a/gtk2_ardour/mini_timeline.cc +++ b/gtk2_ardour/mini_timeline.cc @@ -57,7 +57,6 @@ MiniTimeline::MiniTimeline () { add_events (Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::BUTTON_PRESS_MASK|Gdk::POINTER_MOTION_MASK|Gdk::SCROLL_MASK); - use_intermediate_surface (); _layout = Pango::Layout::create (get_pango_context()); UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &MiniTimeline::set_colors)); @@ -510,6 +509,8 @@ MiniTimeline::render (Cairo::RefPtr const& ctx, cairo_rectangle_ return; } + cairo_push_group (cr); + const int width = get_width (); const int height = get_height (); @@ -521,6 +522,8 @@ MiniTimeline::render (Cairo::RefPtr const& ctx, cairo_rectangle_ cairo_clip (cr); if (_session == 0) { + cairo_pop_group_to_source (cr); + cairo_paint (cr); return; } @@ -662,6 +665,9 @@ MiniTimeline::render (Cairo::RefPtr const& ctx, cairo_rectangle_ cairo_rel_line_to (cr, 3, 4); cairo_close_path (cr); cairo_fill (cr); + + cairo_pop_group_to_source (cr); + cairo_paint (cr); } void