transport_loop_range_rect->property_outline_pixels() = 1;
transport_loop_range_rect->hide();
+ transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
+ transport_punch_range_rect->property_outline_pixels() = 0;
+ transport_punch_range_rect->hide();
+
/* a group to hold time (measure) lines */
time_line_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
+ range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
+ range_marker_drag_rect->hide ();
+
_trackview_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
- _region_motion_group = new ArdourCanvas::Group (*_master_group, 0.0, 0.0);
+ _region_motion_group = new ArdourCanvas::Group (*_trackview_group, 0.0, 0.0);
/* el barrio */
cd_marker_bar->property_outline_what() = (0x1 | 0x8);
cd_marker_bar->property_outline_pixels() = 1;
- range_marker_drag_rect = new ArdourCanvas::SimpleRect (*time_line_group, 0.0, 0.0, 0.0, 0.0);
- //range_marker_drag_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
- range_marker_drag_rect->hide ();
-
timebar_group = new ArdourCanvas::Group (*track_canvas->root());
cursor_group = new ArdourCanvas::Group (*track_canvas->root(), 0.0, 0.0);
transport_bar_drag_rect->property_outline_pixels() = 0;
transport_bar_drag_rect->hide ();
- transport_punch_range_rect = new ArdourCanvas::SimpleRect (*_master_group, 0.0, 0.0, 0.0, 0.0);
- transport_punch_range_rect->property_outline_pixels() = 0;
- transport_punch_range_rect->hide();
-
-// transport_loop_range_rect->lower_to_bottom (); // loop on the bottom
-
transport_punchin_line = new ArdourCanvas::SimpleLine (*_master_group);
transport_punchin_line->property_x1() = 0.0;
transport_punchin_line->property_y1() = 0.0;
cd_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_cd_marker_bar_event), cd_marker_bar));
range_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_range_marker_bar_event), range_marker_bar));
transport_marker_bar->signal_event().connect (bind (mem_fun (*this, &Editor::canvas_transport_marker_bar_event), transport_marker_bar));
-
- ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_loop_range_view), false));
- ZoomChanged.connect (bind (mem_fun(*this, &Editor::update_punch_range_view), false));
playhead_cursor = new Cursor (*this, &Editor::canvas_playhead_cursor_event);
reset_hscrollbar_stepping ();
update_fixed_rulers();
redisplay_tempo (false);
+
+ last_trackview_group_vertical_offset = get_trackview_group_vertical_offset ();
Resized (); /* EMIT_SIGNAL */
TreeModel::Children rows = route_display_model->children();
TreeModel::Children::iterator i;
double pos;
+ bool changed = false;
for (pos = 0, i = rows.begin(); i != rows.end(); ++i) {
TimeAxisView *tv = (*i)[route_display_columns.tv];
if (tv != 0) {
pos += tv->effective_height;
+ tv->clip_to_viewport ();
}
}
if (!screen) {
screen = Gdk::Screen::get_default();
}
-
+ gint height = min ( (gint) pos, (screen->get_height() - 400));
gint width = max (edit_controls_vbox.get_width(), controls_layout.get_width());
/* don't get too big. the fudge factors here are just guesses */
width = min (width, screen->get_width() - 300);
+ if ((req->width != width) || (req->height != height)) {
+ changed = true;
+ controls_layout_size_request_connection.disconnect ();
+ }
+
if (req->width != width) {
+ gint vbox_width = edit_controls_vbox.get_width();
req->width = width;
- time_button_event_box.set_size_request(edit_controls_vbox.get_width(), -1);
- zoom_box.set_size_request(edit_controls_vbox.get_width(), -1);
+
+ /* this one is important: it determines how big the layout thinks it really is, as
+ opposed to what it displays on the screen
+ */
+ controls_layout.property_width () = vbox_width;
+ controls_layout.property_width_request () = vbox_width;
+
+ time_button_event_box.property_width_request () = vbox_width;
+ zoom_box.property_width_request () = vbox_width;
}
- gint height = min ( (gint) pos, (screen->get_height() - 400));
if (req->height != height) {
req->height = height;
+ controls_layout.property_height () = (guint) floor (pos);
}
- if (width != edit_controls_vbox.get_width()) {
-
- /* this one is important: it determines how big the layout thinks it really is, as
- opposed to what it displays on the screen
- */
- controls_layout.set_size (edit_controls_vbox.get_width(), pos );
- controls_layout.set_size_request(edit_controls_vbox.get_width(), -1);
+ if (changed) {
+ controls_layout_size_request_connection = controls_layout.signal_size_request().connect (mem_fun (*this, &Editor::controls_layout_size_request));
}
}
void
Editor::maybe_autoscroll (GdkEventMotion* event)
{
+
nframes64_t rightmost_frame = leftmost_frame + current_page_frames();
nframes64_t frame = drag_info.current_pointer_frame;
bool startit = false;
- double vertical_pos = vertical_adjustment.get_value();
- double upper = vertical_adjustment.get_upper();
-
- /*
- adjust the event.y to take account of the bounds
- of the _trackview_group
- */
-
- double vsx1, vsx2, vsy1, vsy2;
- _trackview_group->get_bounds (vsx1, vsy1, vsx2, vsy2);
autoscroll_y = 0;
autoscroll_x = 0;
-
- if ((event->y - vsy1) < vertical_pos) {
+ if (event->y < canvas_timebars_vsize) {
autoscroll_y = -1;
startit = true;
- }
-
- if ((event->y - vsy1) > (vertical_pos + canvas_height - canvas_timebars_vsize) && vertical_pos <= upper) {
+ } else if (event->y > canvas_height) {
autoscroll_y = 1;
startit = true;
}
double new_pixel;
double target_pixel;
- if (autoscroll_x_distance != 0) {
-
- if (autoscroll_cnt == 50) { /* 0.5 seconds */
-
- /* after about a while, speed up a bit by changing the timeout interval */
-
- autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/30.0f);
-
- } else if (autoscroll_cnt == 150) { /* 1.0 seconds */
-
- autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/20.0f);
-
- } else if (autoscroll_cnt == 300) { /* 1.5 seconds */
-
- /* after about another while, speed up by increasing the shift per callback */
-
- autoscroll_x_distance = (nframes64_t) floor (current_page_frames()/10.0f);
-
- }
- }
-
- if (autoscroll_y_distance != 0) {
-
- if (autoscroll_cnt == 50) { /* 0.5 seconds */
-
- /* after about a while, speed up a bit by changing the timeout interval */
-
- autoscroll_y_distance = 10;
-
- } else if (autoscroll_cnt == 150) { /* 1.0 seconds */
-
- autoscroll_y_distance = 20;
-
- } else if (autoscroll_cnt == 300) { /* 1.5 seconds */
-
- /* after about another while, speed up by increasing the shift per callback */
-
- autoscroll_y_distance = 40;
- }
+ if (autoscroll_x > 0) {
+ autoscroll_x_distance = (unit_to_frame (drag_info.current_pointer_x) - (leftmost_frame + current_page_frames())) / 3;
+ } else if (autoscroll_x < 0) {
+ autoscroll_x_distance = (leftmost_frame - unit_to_frame (drag_info.current_pointer_x)) / 3;
+
}
-
+
+ if (autoscroll_y > 0) {
+ autoscroll_y_distance = (drag_info.current_pointer_y - (get_trackview_group_vertical_offset() + canvas_height)) / 3;
+ } else if (autoscroll_y < 0) {
+
+ autoscroll_y_distance = (vertical_adjustment.get_value () - drag_info.current_pointer_y) / 3;
+ }
+
if (autoscroll_x < 0) {
if (leftmost_frame < autoscroll_x_distance) {
new_frame = 0;
new_pixel = vertical_pos;
}
-
-
if ((new_frame == 0 || new_frame == limit) && (new_pixel == 0 || new_pixel == DBL_MAX)) {
/* we are done */
return false;
reset_x_origin (new_frame);
}
- vertical_adjustment.set_value (new_pixel);
-
/* fake an event. */
Glib::RefPtr<Gdk::Window> canvas_window = const_cast<Editor*>(this)->track_canvas->get_window();
motion_handler (drag_info.item, (GdkEvent*) &ev, drag_info.item_type, true);
+ vertical_adjustment.set_value (new_pixel);
+
autoscroll_cnt++;
if (autoscroll_cnt == 1) {
_master_group->move (-x_delta, 0);
timebar_group->move (-x_delta, 0);
cursor_group->move (-x_delta, 0);
+ update_fixed_rulers ();
+ redisplay_tempo (true);
}
void
Editor::scroll_canvas_vertically ()
{
/* vertical scrolling only */
- double x1, x2, y1, y2, y_delta;
+ double y_delta;
- _trackview_group->get_bounds(x1, y1, x2, y2);
- y_delta = y1 + vertical_adjustment.get_value() - canvas_timebars_vsize;
+ y_delta = last_trackview_group_vertical_offset - get_trackview_group_vertical_offset ();
- _trackview_group->move (0, -y_delta);
- _region_motion_group->move (0, -y_delta);
+ _trackview_group->move (0, y_delta);
-#ifndef GTKOSX
+ for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
+ (*i)->clip_to_viewport ();
+ }
+ last_trackview_group_vertical_offset = get_trackview_group_vertical_offset ();
/* required to keep the controls_layout in lock step with the canvas group */
track_canvas->update_now ();
-#endif
}
void
if (time_origin != leftmost_frame) {
canvas_scroll_to (time_origin);
}
+ redisplay_tempo (true);
}
void
last_canvas_frame = rightmost_frame;
//reset_scrolling_region ();
}
-
- update_fixed_rulers ();
-
- //redisplay_tempo (!_dragging_hscrollbar);
- redisplay_tempo (true);
}
void
location_punch_color = ARDOUR_UI::config()->canvasvar_LocationPunch.get();
refresh_location_display ();
+/*
redisplay_tempo (true);
if (session)
session->tempo_map().apply_with_metrics (*this, &Editor::draw_metric_marks); // redraw metric markers
+*/
}
-
void
Editor::flush_canvas ()
{
projects / ardour.git / blobdiff