double const p = (_editor->playhead_cursor->current_frame - _start) * _x_scale;
cairo_move_to (cr, p, 0);
- cairo_line_to (cr, p, _height);
+ cairo_line_to (cr, p, get_height());
cairo_stroke (cr);
_last_playhead = p;
/* background */
cairo_set_source_rgb (cr, 0, 0, 0);
- cairo_rectangle (cr, 0, 0, _width, _height);
+ cairo_rectangle (cr, 0, 0, get_width(), get_height());
cairo_fill (cr);
if (_session == 0) {
if (N == 0) {
_track_height = 16;
} else {
- _track_height = (double) _height / N;
+ _track_height = (double) get_height() / N;
}
/* calculate x scale */
if (_end != _start) {
- _x_scale = static_cast<double> (_width) / (_end - _start);
+ _x_scale = static_cast<double> (get_width()) / (_end - _start);
} else {
_x_scale = 1;
}
cairo_set_source_rgb (cr, 0.2, 0.2, 0.2);
cairo_set_line_width (cr, _track_height - 2);
cairo_move_to (cr, 0, y + _track_height / 2);
- cairo_line_to (cr, _width, y + _track_height / 2);
+ cairo_line_to (cr, get_width(), y + _track_height / 2);
cairo_stroke (cr);
StreamView* s = (*i)->view ();
double const p = (_session->current_start_frame() - _start) * _x_scale;
cairo_move_to (cr, p, 0);
- cairo_line_to (cr, p, _height);
+ cairo_line_to (cr, p, get_height());
cairo_stroke (cr);
double const q = (_session->current_end_frame() - _start) * _x_scale;
cairo_move_to (cr, q, 0);
- cairo_line_to (cr, q, _height);
+ cairo_line_to (cr, q, get_height());
cairo_stroke (cr);
}
double ex = ev->x - w / 2;
if (ex < 0) {
ex = 0;
- } else if ((ex + w) > _width) {
- ex = _width - w;
+ } else if ((ex + w) > get_width()) {
+ ex = get_width() - w;
}
double const h = yr.second - yr.first;
double ey = ev->y - h / 2;
if (ey < 0) {
ey = 0;
- } else if ((ey + h) > _height) {
- ey = _height - h;
+ } else if ((ey + h) > get_height()) {
+ ey = get_height() - h;
}
set_editor (ex, ey);
_old_follow_playhead = _editor->follow_playhead ();
_editor->set_follow_playhead (false);
+ if (suspending_editor_updates ()) {
+ 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 */
/* start a move drag */
+ /* get the editor's state in case we are suspending updates */
+ get_editor (&_pending_editor_x, &_pending_editor_y);
+ _pending_editor_changed = false;
+
_move_dragging = true;
_moved = false;
_editor->_dragging_playhead = true;
return true;
}
+/** @return true if we are currently suspending updates to the editor's viewport,
+ * which we do if configured to do so, and if in a drag of some kind.
+ */
+bool
+EditorSummary::suspending_editor_updates () const
+{
+ return (!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 */
void
EditorSummary::get_editor (pair<double, double>* x, pair<double, double>* y) const
assert (x);
assert (y);
- x->first = (_editor->leftmost_position () - _start) * _x_scale;
- x->second = x->first + _editor->current_page_frames() * _x_scale;
+ if (suspending_editor_updates ()) {
+
+ /* 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;
+
+ } else {
+
+ /* Otherwise query the editor for its actual position */
- y->first = editor_y_to_summary (_editor->vertical_adjustment.get_value ());
- y->second = editor_y_to_summary (_editor->vertical_adjustment.get_value () + _editor->canvas_height() - _editor->get_canvas_timebars_vsize());
+ x->first = (_editor->leftmost_position () - _start) * _x_scale;
+ x->second = x->first + _editor->current_page_frames() * _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->canvas_height() - _editor->get_canvas_timebars_vsize());
+ }
}
/** Get an expression of the position of a point with respect to the view rectangle */
bool
EditorSummary::on_button_release_event (GdkEventButton*)
{
+ bool const was_suspended = suspending_editor_updates ();
+
_move_dragging = false;
_zoom_dragging = false;
_editor->_dragging_playhead = false;
_editor->set_follow_playhead (_old_follow_playhead, false);
+ if (was_suspended && _pending_editor_changed) {
+ set_editor (_pending_editor_x, _pending_editor_y);
+ }
+
return true;
}
amount = 1;
}
- if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+ if (Keyboard::modifier_state_equals (ev->state, Keyboard::SecondaryModifier)) {
- /* primary-wheel == left-right scrolling */
+ /* secondary-wheel == left-right scrolling */
if (ev->direction == GDK_SCROLL_UP) {
- x += amount;
- } else if (ev->direction == GDK_SCROLL_DOWN) {
x -= amount;
+ } else if (ev->direction == GDK_SCROLL_DOWN) {
+ x += amount;
+ }
+
+ } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) {
+
+ /* primary-wheel == zoom */
+
+ if (ev->direction == GDK_SCROLL_UP) {
+ _editor->temporal_zoom_step (false);
+ } else {
+ _editor->temporal_zoom_step (true);
}
} else {
* x and y parameters are specified in summary coordinates.
*/
void
-EditorSummary::set_editor (pair<double,double> const & x, double const y)
+EditorSummary::set_editor (pair<double,double> const x, double const y)
{
if (_editor->pending_visual_change.idle_handler_id >= 0) {
/* see comment in other set_editor () */
* x and y parameters are specified in summary coordinates.
*/
void
-EditorSummary::set_editor (pair<double,double> const & x, pair<double, double> const & y)
+EditorSummary::set_editor (pair<double,double> const x, pair<double, double> const y)
{
if (_editor->pending_visual_change.idle_handler_id >= 0) {
/* see comment in other set_editor () */
* @param x new x left position in summary coordinates.
*/
void
-EditorSummary::set_editor_x (double const x)
+EditorSummary::set_editor_x (double x)
{
- _editor->reset_x_origin (x / _x_scale + _start);
+ if (x < 0) {
+ x = 0;
+ }
+
+ if (suspending_editor_updates ()) {
+ double const w = _pending_editor_x.second - _pending_editor_x.first;
+ _pending_editor_x.first = x;
+ _pending_editor_x.second = x + w;
+ _pending_editor_changed = true;
+ set_dirty ();
+ } else {
+ _editor->reset_x_origin (x / _x_scale + _start);
+ }
}
/** Set the x range visible in the editor.
* @param x new x range in summary coordinates.
*/
void
-EditorSummary::set_editor_x (pair<double, double> const & x)
+EditorSummary::set_editor_x (pair<double, double> x)
{
- _editor->reset_x_origin (x.first / _x_scale + _start);
+ if (x.first < 0) {
+ x.first = 0;
+ }
- double const nx = (
- ((x.second - x.first) / _x_scale) /
- _editor->frame_to_unit (_editor->current_page_frames())
- );
+ if (x.second < 0) {
+ x.second = x.first + 1;
+ }
- if (nx != _editor->get_current_zoom ()) {
- _editor->reset_zoom (nx);
+ if (suspending_editor_updates ()) {
+ _pending_editor_x = x;
+ _pending_editor_changed = true;
+ set_dirty ();
+ } else {
+ _editor->reset_x_origin (x.first / _x_scale + _start);
+
+ double const nx = (
+ ((x.second - x.first) / _x_scale) /
+ _editor->frame_to_unit (_editor->current_page_frames())
+ );
+
+ if (nx != _editor->get_current_zoom ()) {
+ _editor->reset_zoom (nx);
+ }
}
}
y1 = 0;
}
- _editor->reset_y_origin (y1);
+ if (suspending_editor_updates ()) {
+ double const h = _pending_editor_y.second - _pending_editor_y.first;
+ _pending_editor_y.first = y;
+ _pending_editor_y.second = y + h;
+ _pending_editor_changed = true;
+ set_dirty ();
+ } else {
+ _editor->reset_y_origin (y1);
+ }
}
/** Set the y range visible in the editor. This is achieved by scaling track heights,
* @param y new editor range in summary coodinates.
*/
void
-EditorSummary::set_editor_y (pair<double, double> const & y)
+EditorSummary::set_editor_y (pair<double, double> const y)
{
+ if (suspending_editor_updates ()) {
+ _pending_editor_y = y;
+ _pending_editor_changed = true;
+ 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'.
projects / ardour.git / blobdiff