#include "editor_cursors.h"
#include "mouse_cursors.h"
#include "route_time_axis.h"
+#include "ui_config.h"
using namespace std;
using namespace ARDOUR;
_view_rectangle_y (0, 0),
_zoom_dragging (false),
_old_follow_playhead (false),
+ _image (0),
_background_dirty (true)
{
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);
+
+ UIConfiguration::instance().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.
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 ();
}
if (_session) {
Region::RegionPropertyChanged.connect (region_property_connection, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context());
- Route::RemoteControlIDChange.connect (route_ctrl_id_connection, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context());
+ PresentationInfo::Change.connect (route_ctrl_id_connection, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context());
_editor->playhead_cursor->PositionChanged.connect (position_connection, invalidator (*this), boost::bind (&EditorSummary::playhead_position_changed, this, _1), gui_context());
- _session->StartTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
- _session->EndTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&CairoWidget::set_dirty, this), gui_context());
+ _session->StartTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context());
+ _session->EndTimeChanged.connect (_session_connections, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context());
_editor->selection->RegionsChanged.connect (sigc::mem_fun(*this, &EditorSummary::set_background_dirty));
}
}
void
EditorSummary::render_background_image ()
{
- _image = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, get_width (), get_height ());
+ 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);
/* background (really just the dividing lines between tracks */
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),
y += _track_height;
}
+
+ /* start and end markers */
+
+ cairo_set_line_width (cr, 1);
+ cairo_set_source_rgb (cr, 1, 1, 0);
+
+ const double p = (_session->current_start_frame() - _start) * _x_scale;
+ cairo_move_to (cr, p, 0);
+ cairo_line_to (cr, p, get_height());
+
+ double const q = (_session->current_end_frame() - _start) * _x_scale;
+ cairo_move_to (cr, q, 0);
+ cairo_line_to (cr, q, get_height());
+ cairo_stroke (cr);
+
cairo_destroy (cr);
}
}
cairo_push_group (cr);
-
- cairo_rectangle (cr, 0, 0, get_width(), get_height());
- cairo_set_source_surface (cr, _image, 0, 0);
- cairo_paint (cr);
-
- /* start and end markers */
- cairo_set_line_width (cr, 1);
- cairo_set_source_rgb (cr, 1, 1, 0);
-
- const double p = (_session->current_start_frame() - _start) * _x_scale;
- cairo_move_to (cr, p, 0);
- cairo_line_to (cr, p, get_height());
+ /* Fill with the background image */
- double const q = (_session->current_end_frame() - _start) * _x_scale;
- cairo_move_to (cr, q, 0);
- cairo_line_to (cr, q, get_height());
- cairo_stroke (cr);
+ cairo_rectangle (cr, 0, 0, get_width(), get_height());
+ cairo_set_source_surface (cr, _image, 0, 0);
+ cairo_fill (cr);
/* Render the view rectangle. If there is an editor visual pending, don't update
the view rectangle now --- wait until the expose event that we'll get after
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_rectangle (cr, _view_rectangle_x.first, _view_rectangle_y.first, width, height);
+ 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 */
void
EditorSummary::set_background_dirty ()
{
- _background_dirty = true;
- set_dirty ();
+ if (!_background_dirty) {
+ _background_dirty = true;
+ set_dirty ();
+ }
}
/** Set the summary so that just the overlays (viewbox, playhead etc.) will be re-rendered */
set_editor (ex, ey);
}
-bool
+bool
EditorSummary::on_enter_notify_event (GdkEventCrossing*)
{
grab_focus ();
return false;
}
-bool
+bool
EditorSummary::on_leave_notify_event (GdkEventCrossing*)
{
/* there are no inferior/child windows, so any leave event means that
EditorSummary::on_button_press_event (GdkEventButton* ev)
{
_old_follow_playhead = _editor->follow_playhead ();
-
+
if (ev->button == 1) {
pair<double, double> xr;
get_editor (&_pending_editor_x, &_pending_editor_y);
_pending_editor_changed = false;
}
-
+
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
/* secondary-modifier-click: locate playhead */
bool
EditorSummary::suspending_editor_updates () const
{
- return (!Config->get_update_editor_during_summary_drag () && (_zoom_dragging || _move_dragging));
+ return (!UIConfiguration::instance().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 */
/* We are dragging, and configured not to update the editor window during drags,
so just return where the editor will be when the drag finishes.
*/
-
+
*x = _pending_editor_x;
*y = _pending_editor_y;
x->first = (_editor->leftmost_sample () - _start) * _x_scale;
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);
}
}
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 ();
EditorSummary::on_button_release_event (GdkEventButton*)
{
bool const was_suspended = suspending_editor_updates ();
-
+
_move_dragging = false;
_zoom_dragging = false;
_editor->_dragging_playhead = false;
if (was_suspended && _pending_editor_changed) {
set_editor (_pending_editor_x, _pending_editor_y);
}
-
+
return true;
}
switch (ev->direction) {
case GDK_SCROLL_UP:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
- x -= 64;
+ _editor->scroll_left_half_page ();
+ return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
_editor->temporal_zoom_step (false);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
break;
case GDK_SCROLL_DOWN:
if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollHorizontalModifier)) {
- x += 64;
+ _editor->scroll_right_half_page ();
+ return true;
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomHorizontalModifier)) {
_editor->temporal_zoom_step (true);
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ScrollZoomVerticalModifier)) {
} else if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
x -= 1;
} else {
- x -= 8;
+ _editor->scroll_left_half_page ();
+ return true;
}
break;
case GDK_SCROLL_RIGHT:
} else if (Keyboard::modifier_state_contains (ev->state, Keyboard::TertiaryModifier)) {
x += 1;
} else {
- x += 8;
+ _editor->scroll_right_half_page ();
+ return true;
}
break;
default:
as it also means that we won't change these variables if an idle handler
is merely pending but not executing. But c'est la vie.
*/
-
+
return;
}
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.
set_dirty ();
} else {
_editor->reset_x_origin (x.first / _x_scale + _start);
-
+
double const nx = (
((x.second - x.first) / _x_scale) /
_editor->sample_to_pixel (_editor->current_page_samples())
);
-
+
if (nx != _editor->get_current_zoom ()) {
_editor->reset_zoom (nx);
}
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;
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'.
/* 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.
}
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;
EditorSummary::routes_added (list<RouteTimeAxisView*> const & r)
{
for (list<RouteTimeAxisView*>::const_iterator i = r.begin(); i != r.end(); ++i) {
- /* Connect to gui_changed() on the route so that we know when their colour has changed */
- (*i)->route()->gui_changed.connect (*this, invalidator (*this), boost::bind (&EditorSummary::route_gui_changed, this, _1), gui_context ());
+ /* Connect to the relevant signal for the route so that we know when its colour has changed */
+ (*i)->route()->presentation_info().PropertyChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::route_gui_changed, this, _1), gui_context ());
boost::shared_ptr<Track> tr = boost::dynamic_pointer_cast<Track> ((*i)->route ());
if (tr) {
tr->PlaylistChanged.connect (*this, invalidator (*this), boost::bind (&EditorSummary::set_background_dirty, this), gui_context ());
}
}
- _background_dirty = true;
- set_dirty ();
+ set_background_dirty ();
}
void
-EditorSummary::route_gui_changed (string c)
+EditorSummary::route_gui_changed (PBD::PropertyChange const& what_changed)
{
- if (c == "color") {
- _background_dirty = true;
- set_dirty ();
+ if (what_changed.contains (Properties::color)) {
+ set_background_dirty ();
}
}
projects / ardour.git / blobdiff