X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fimageframe_time_axis_view.cc;h=a57db60a38212e137fc980bed155b391ade00b9a;hb=b6b366b631cc0ee60df8e6e9bb7a9acdac7d0402;hp=91575f3cc54522f21881c35c995ba7e9a259ba04;hpb=d6ef740e9002c7112bc47cb2d9d8d4b8609aa089;p=ardour.git diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc index 91575f3cc5..a57db60a38 100644 --- a/gtk2_ardour/imageframe_time_axis_view.cc +++ b/gtk2_ardour/imageframe_time_axis_view.cc @@ -32,6 +32,7 @@ #include "public_editor.h" #include "rgb_macros.h" #include "gui_thread.h" +#include "ardour_ui.h" #include "i18n.h" @@ -49,12 +50,12 @@ using namespace Editing; ImageFrameTimeAxisView::ImageFrameTimeAxisView (ImageFrameTimeAxis& tv) : _trackview (tv), canvas_group (*_trackview.canvas_display), - canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.height) + canvas_rect (canvas_group, 0.0, 0.0, 1000000.0, tv.current_height()) { region_color = _trackview.color() ; - stream_base_color = color_map[cImageTrackBase] ; + stream_base_color = ARDOUR_UI::config()->canvasvar_ImageTrack.get() ; - canvas_rect.property_outline_color_rgba() = color_map[cImageTrackOutline]; + canvas_rect.property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_ImageTrack.get(); canvas_rect.property_fill_color_rgba() = stream_base_color; canvas_rect.signal_event().connect (bind (mem_fun (_trackview.editor, &PublicEditor::canvas_imageframe_view_event), (ArdourCanvas::Item*) &canvas_rect, &tv));