X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_canvas.cc;h=b636fccc9cf4ac82d430a9299bbe59c5e7da53da;hb=ce6c41c060c700489a9ac9fc5080bf2920c17ae2;hp=8e91715576161e5cf9f1534c650ffdb07f488dd3;hpb=25b46464e3eeb2dab0a1365d2fe171b4fda5f490;p=ardour.git diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 8e91715576..b636fccc9c 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -20,6 +20,9 @@ #include #include +#include + +#include #include "ardour_ui.h" #include "editor.h" @@ -93,11 +96,15 @@ Editor::initialize_canvas () track_canvas.set_name ("EditorMainCanvas"); track_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK|Gdk::SCROLL_MASK); track_canvas.signal_leave_notify_event().connect (mem_fun(*this, &Editor::left_track_canvas)); - + track_canvas.set_flags (CAN_FOCUS); + /* set up drag-n-drop */ + vector target_table; - target_table.push_back (TargetEntry ("STRING")); + // Drag-N-Drop from the region list can generate this target + target_table.push_back (TargetEntry ("regions")); + target_table.push_back (TargetEntry ("text/plain")); target_table.push_back (TargetEntry ("text/uri-list")); target_table.push_back (TargetEntry ("application/x-rootwin-drop")); @@ -123,6 +130,8 @@ Editor::initialize_canvas () time_canvas.set_name ("EditorTimeCanvas"); time_canvas.add_events (Gdk::POINTER_MOTION_HINT_MASK); + time_canvas.set_flags (CAN_FOCUS); + time_canvas.set_center_scroll_region (false); meter_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, 0.0); tempo_group = new ArdourCanvas::Group (*time_canvas.root(), 0.0, timebar_height); @@ -266,44 +275,11 @@ Editor::track_canvas_allocate (Gtk::Allocation alloc) canvas_width = alloc.get_width(); canvas_height = alloc.get_height(); - if (session == 0 && !ARDOUR_UI::instance()->will_create_new_session_automatically()) { - - /* this mess of code is here to find out how wide this text is and - position the message in the center of the editor window. - */ - - int pixel_height; - int pixel_width; - - ustring msg = string_compose ("%1%2", - _("Start a new session\n"), _("via Session menu")); - - RefPtr layout = create_pango_layout (msg); - Pango::FontDescription font = get_font_for_style (N_("FirstActionMessage")); - layout->get_pixel_size (pixel_width, pixel_height); - - if (first_action_message == 0) { - - first_action_message = new ArdourCanvas::Text (*track_canvas.root()); - first_action_message->property_font_desc() = font; - first_action_message->property_fill_color_rgba() = color_map[cFirstActionMessage]; - first_action_message->property_x() = (canvas_width - pixel_width) / 2.0; - first_action_message->property_y() = (canvas_height/2.0) - pixel_height; - first_action_message->property_anchor() = ANCHOR_NORTH_WEST; - first_action_message->property_markup() = msg; - - } else { - - /* center it */ - first_action_message->property_x() = (canvas_width - pixel_width) / 2.0; - first_action_message->property_y() = (canvas_height/2.0) - pixel_height; - } - } - zoom_range_clock.set ((jack_nframes_t) floor ((canvas_width * frames_per_unit))); edit_cursor->set_position (edit_cursor->current_frame); playhead_cursor->set_position (playhead_cursor->current_frame); + reset_hscrollbar_stepping (); reset_scrolling_region (); if (edit_cursor) edit_cursor->set_length (canvas_height); @@ -360,29 +336,59 @@ Editor::reset_scrolling_region (Gtk::Allocation* alloc) for (pos = 0, i = rows.begin(); i != rows.end(); ++i) { TimeAxisView *tv = (*i)[route_display_columns.tv]; - pos += tv->effective_height; - pos += track_spacing; + if (tv != 0 && !tv->hidden()) { + pos += tv->effective_height; + pos += track_spacing; + } } - RefPtr screen = get_screen(); - - if (!screen) { - screen = Gdk::Screen::get_default(); - } + double last_canvas_unit = last_canvas_frame / frames_per_unit; - double last_canvas_unit = ceil ((double) max_frames / frames_per_unit); track_canvas.set_scroll_region (0.0, 0.0, max (last_canvas_unit, canvas_width), pos); // XXX what is the correct height value for the time canvas ? this overstates it time_canvas.set_scroll_region ( 0.0, 0.0, max (last_canvas_unit, canvas_width), canvas_height); + controls_layout.queue_resize(); +} + +void +Editor::controls_layout_size_request (Requisition* req) +{ + TreeModel::Children rows = route_display_model->children(); + TreeModel::Children::iterator i; + double pos; + + for (pos = 0, i = rows.begin(); i != rows.end(); ++i) { + TimeAxisView *tv = (*i)[route_display_columns.tv]; + if (tv != 0) { + pos += tv->effective_height; + pos += track_spacing; + } + } + + RefPtr screen = get_screen(); + + if (!screen) { + screen = Gdk::Screen::get_default(); + } + /* never let the width of the controls area shrink horizontally */ edit_controls_vbox.check_resize(); - int w = max (edit_controls_vbox.get_width(), controls_layout.get_width()); - controls_layout.set_size_request (w, min ((gint) pos, (screen->get_height() - 400))); - controls_layout.set_size (w, (gint) pos); + req->width = max (edit_controls_vbox.get_width(), controls_layout.get_width()); + + /* don't get too big. the fudge factors here are just guesses */ + + req->width = min (req->width, screen->get_width() - 300); + req->height = min ((gint) pos, (screen->get_height() - 400)); + + /* 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 (req->width, (gint) pos); } bool @@ -404,11 +410,24 @@ Editor::track_canvas_drag_data_received (const RefPtr& context int x, int y, const SelectionData& data, guint info, guint time) +{ + if (data.get_target() == "regions") { + drop_regions (context, x, y, data, info, time); + } else { + drop_paths (context, x, y, data, info, time); + } +} + +void +Editor::drop_paths (const RefPtr& context, + int x, int y, + const SelectionData& data, + guint info, guint time) { TimeAxisView* tvp; AudioTimeAxisView* tv; double cy; - vector paths; + vector paths; string spath; GdkEvent ev; jack_nframes_t frame; @@ -423,7 +442,9 @@ Editor::track_canvas_drag_data_received (const RefPtr& context double wx; double wy; - track_canvas.window_to_world ( x, y, wx, wy); + track_canvas.window_to_world (x, y, wx, wy); + wx += horizontal_adjustment.get_value(); + wy += vertical_adjustment.get_value(); ev.type = GDK_BUTTON_RELEASE; ev.button.x = wx; @@ -435,25 +456,42 @@ Editor::track_canvas_drag_data_received (const RefPtr& context if ((tvp = trackview_by_y_position (cy)) == 0) { - /* drop onto canvas background: create a new track */ - - insert_paths_as_new_tracks (paths, false); + /* drop onto canvas background: create new tracks */ + jack_nframes_t pos = 0; + do_embed (paths, false, ImportAsTrack, 0, pos, false); } else if ((tv = dynamic_cast(tvp)) != 0) { /* check that its an audio track, not a bus */ - + if (tv->get_diskstream()) { - - for (vector::iterator p = paths.begin(); p != paths.end(); ++p) { - insert_sndfile_into (*p, true, tv, frame); - } + do_embed (paths, false, ImportToTrack, tv->audio_track(), frame, true); } - } out: context->drag_finish (true, false, time); } +void +Editor::drop_regions (const RefPtr& context, + int x, int y, + const SelectionData& data, + guint info, guint time) +{ + const DnDTreeView::SerializedObjectPointers* sr = reinterpret_cast (data.get_data()); + + for (uint32_t i = 0; i < sr->cnt; ++i) { + + Region* r = reinterpret_cast (sr->ptr[i]); + AudioRegion* ar; + + if ((ar = dynamic_cast(r)) != 0) { + insert_region_list_drag (*ar, x, y); + } + } + + context->drag_finish (true, false, time); +} +