diff options
| author | David Robillard <d@drobilla.net> | 2015-01-11 21:41:17 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2015-01-12 01:03:17 -0500 |
| commit | e79af77a18c13a304c0c08e52ca337b03ecc0a78 (patch) | |
| tree | 4c2ea480cec34df2fe3f83b30736e5c6d280b00d /gtk2_ardour/editor_canvas.cc | |
| parent | 4d370b8942425a6ec0e6ce82bf3311de69fa2aae (diff) | |
Revert "hotfix z-stacking"
This reverts commit 03f0229bcfc35916f81c6187948df3ea3b79a976.
Mitigate the fallout from said overly aggressive revert: preserve the alpha
values to not break the color configuration for when the lines are fixed.
Diffstat (limited to 'gtk2_ardour/editor_canvas.cc')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 49f317188e..335117114f 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -123,7 +123,7 @@ Editor::initialize_canvas () transport_punch_range_rect->hide(); /*a group to hold time (measure) lines */ - time_line_group = new ArdourCanvas::Container (hv_scroll_group); + time_line_group = new ArdourCanvas::Container (h_scroll_group); CANVAS_DEBUG_NAME (time_line_group, "time line group"); _trackview_group = new ArdourCanvas::Container (hv_scroll_group); @@ -231,6 +231,7 @@ Editor::initialize_canvas () logo_item->lower_to_bottom (); } + hv_scroll_group->raise_to_top (); _canvas_drop_zone = new ArdourCanvas::Rectangle (hv_scroll_group, ArdourCanvas::Rect (0.0, 0.0, ArdourCanvas::COORD_MAX, 0.0)); /* this thing is transparent */ @@ -899,22 +900,22 @@ Editor::color_handler() playhead_cursor->set_color (ARDOUR_UI::config()->color ("play head")); - meter_bar->set_fill_color (ARDOUR_UI::config()->color ("meter bar")); + meter_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("meter bar", "marker bar")); meter_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - tempo_bar->set_fill_color (ARDOUR_UI::config()->color ("tempo bar")); + tempo_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("tempo bar", "marker bar")); tempo_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - marker_bar->set_fill_color (ARDOUR_UI::config()->color ("marker bar")); + marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("marker bar", "marker bar")); marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("cd marker bar")); + cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker bar")); cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - range_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("range marker bar")); + range_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("range marker bar", "marker bar")); range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); - transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar")); + transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("transport marker bar", "marker bar")); transport_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator")); cd_marker_bar_drag_rect->set_fill_color (ARDOUR_UI::config()->color ("range drag bar rect")); |