X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_summary.cc;h=b570cf4e1a0238c1e9d57bf6f2c70106487d84ca;hb=aabc5108f34058d466d1e7451694193a08379ce2;hp=641b060e1731fa3b171d222629198c3a56887919;hpb=5d0303b851363d138ee4760096aa6adfd9955f9a;p=ardour.git diff --git a/gtk2_ardour/editor_summary.cc b/gtk2_ardour/editor_summary.cc index 641b060e17..b570cf4e1a 100644 --- a/gtk2_ardour/editor_summary.cc +++ b/gtk2_ardour/editor_summary.cc @@ -21,6 +21,7 @@ #include "canvas/debug.h" +#include "ardour_ui.h" #include "time_axis_view.h" #include "streamview.h" #include "editor_summary.h" @@ -60,6 +61,22 @@ EditorSummary::EditorSummary (Editor* e) { add_events (Gdk::POINTER_MOTION_MASK|Gdk::KEY_PRESS_MASK|Gdk::KEY_RELEASE_MASK|Gdk::ENTER_NOTIFY_MASK|Gdk::LEAVE_NOTIFY_MASK); set_flags (get_flags() | Gtk::CAN_FOCUS); + + ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &EditorSummary::parameter_changed)); +} + +EditorSummary::~EditorSummary () +{ + cairo_surface_destroy (_image); +} + +void +EditorSummary::parameter_changed (string p) +{ + + if (p == "color-regions-using-track-color") { + set_background_dirty (); + } } /** Handle a size allocation. @@ -68,9 +85,8 @@ EditorSummary::EditorSummary (Editor* e) void EditorSummary::on_size_allocate (Gtk::Allocation& alloc) { - Gtk::EventBox::on_size_allocate (alloc); - _background_dirty = true; - set_dirty (); + CairoWidget::on_size_allocate (alloc); + set_background_dirty (); } @@ -102,14 +118,8 @@ EditorSummary::set_session (Session* s) void EditorSummary::render_background_image () { - int stride; - unsigned char *data; - if (_image) { - free (cairo_image_surface_get_data (_image)); - } - stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, get_width ()); - data = (unsigned char*) malloc (stride * get_height ()); - _image = cairo_image_surface_create_for_data (data, CAIRO_FORMAT_RGB24, get_width (), get_height (), stride); + cairo_surface_destroy (_image); // passing NULL is safe + _image = cairo_image_surface_create (CAIRO_FORMAT_RGB24, get_width (), get_height ()); cairo_t* cr = cairo_create (_image); @@ -167,7 +177,7 @@ EditorSummary::render_background_image () StreamView* s = (*i)->view (); if (s) { - cairo_set_line_width (cr, _track_height * 0.6); + cairo_set_line_width (cr, _track_height * 0.8); s->foreach_regionview (sigc::bind ( sigc::mem_fun (*this, &EditorSummary::render_region), @@ -232,10 +242,10 @@ EditorSummary::render (cairo_t* cr, cairo_rectangle_t*) int32_t width = _view_rectangle_x.second - _view_rectangle_x.first; int32_t height = _view_rectangle_y.second - _view_rectangle_y.first; cairo_rectangle (cr, _view_rectangle_x.first, _view_rectangle_y.first, width, height); - cairo_set_source_rgba (cr, 1, 1, 1, 0.25); + cairo_set_source_rgba (cr, 1, 1, 1, 0.1); cairo_fill_preserve (cr); cairo_set_line_width (cr, 1); - cairo_set_source_rgba (cr, 1, 1, 1, 0.5); + cairo_set_source_rgba (cr, 1, 1, 1, 0.4); cairo_stroke (cr); /* Playhead */ @@ -464,7 +474,7 @@ EditorSummary::on_button_press_event (GdkEventButton* ev) bool EditorSummary::suspending_editor_updates () const { - return (!Config->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging)); + return (!ARDOUR_UI::config()->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging)); } /** Fill in x and y with the editor's current viewable area in summary coordinates */ @@ -491,7 +501,7 @@ EditorSummary::get_editor (pair* x, pair* y) con x->second = x->first + _editor->current_page_samples() * _x_scale; y->first = editor_y_to_summary (_editor->vertical_adjustment.get_value ()); - y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->visible_canvas_height()); + y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y); } } @@ -629,12 +639,16 @@ EditorSummary::on_motion_notify_event (GdkEventMotion* ev) xr.first += dx; } else if (_zoom_position == RIGHT || _zoom_position == RIGHT_TOP || _zoom_position == RIGHT_BOTTOM) { xr.second += dx; + } else { + xr.first = -1; /* do not change */ } if (_zoom_position == TOP || _zoom_position == LEFT_TOP || _zoom_position == RIGHT_TOP) { yr.first += dy; } else if (_zoom_position == BOTTOM || _zoom_position == LEFT_BOTTOM || _zoom_position == RIGHT_BOTTOM) { yr.second += dy; + } else { + yr.first = -1; /* do not change y */ } set_overlays_dirty (); @@ -789,8 +803,12 @@ EditorSummary::set_editor (pair const x, pair con return; } - set_editor_x (x); - set_editor_y (y); + if (x.first >= 0) { + set_editor_x (x); + } + if (y.first >= 0) { + set_editor_y (y); + } } /** Set the left of the x range visible in the editor. @@ -856,7 +874,7 @@ void EditorSummary::set_editor_y (double const y) { double y1 = summary_y_to_editor (y); - double const eh = _editor->visible_canvas_height(); + double const eh = _editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y; double y2 = y1 + eh; double const full_editor_height = _editor->_full_canvas_height; @@ -894,7 +912,7 @@ EditorSummary::set_editor_y (pair const y) set_dirty (); return; } - + /* Compute current height of tracks between y.first and y.second. We add up the total height into `total_height' and the height of complete tracks into `scale height'. @@ -936,7 +954,7 @@ EditorSummary::set_editor_y (pair const y) /* Height that we will use for scaling; use the whole editor height unless there are not enough tracks to fill it. */ - double const ch = min (total_height, _editor->visible_canvas_height()); + double const ch = min (total_height, (_editor->visible_canvas_height() - _editor->get_trackview_group()->canvas_origin().y)); /* hence required scale factor of the complete tracks to fit the required y range; the amount of space they should take up divided by the amount they currently take up. @@ -954,7 +972,7 @@ EditorSummary::set_editor_y (pair const y) } if (yc.first <= 0 && yc.second >= _track_height) { - (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale))); + (*i)->set_height (max (TimeAxisView::preset_height (HeightSmall), (uint32_t) ((*i)->effective_height() * scale)), TimeAxisView::TotalHeight); } yc.first -= _track_height; @@ -1036,16 +1054,14 @@ EditorSummary::routes_added (list const & r) } } - _background_dirty = true; - set_dirty (); + set_background_dirty (); } void EditorSummary::route_gui_changed (string c) { if (c == "color") { - _background_dirty = true; - set_dirty (); + set_background_dirty (); } }