meta-fy handling of button2, to deal with apple's messed up design decisions; on...

[ardour.git] / gtk2_ardour / imageframe_time_axis_view.cc

diff --git a/gtk2_ardour/imageframe_time_axis_view.cc b/gtk2_ardour/imageframe_time_axis_view.cc
index 6e896ea5ecb93a789abe123a2619e979dd521f0b..a57db60a38212e137fc980bed155b391ade00b9a 100644 (file)
--- a/gtk2_ardour/imageframe_time_axis_view.cc
+++ b/gtk2_ardour/imageframe_time_axis_view.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
@@ -33,6 +32,7 @@
 #include "public_editor.h"
 #include "rgb_macros.h"
 #include "gui_thread.h"
+#include "ardour_ui.h"
 
 #include "i18n.h"
 
@@ -50,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));