X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=db141a9f01b8acf79dd27b381531359e21a04428;hb=a7f4f660956250cc98cc519321ad5b8e715f9d0f;hp=289686c7ce9e09987d38164ee6764fc4fafd07a9;hpb=4c000c13eecf4cb3d63be304fc0056ddaa35bb21;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 289686c7ce..db141a9f01 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -17,11 +17,11 @@ */ -#include -#include +#include "pbd/error.h" +#include "pbd/stacktrace.h" -#include -#include +#include "ardour/types.h" +#include "ardour/ardour.h" #include @@ -45,7 +45,7 @@ using namespace ARDOUR; //------------------------------------------------------------------------------ /** Initialize const static memeber data */ -Pango::FontDescription TimeAxisViewItem::NAME_FONT; +Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0; bool TimeAxisViewItem::have_name_font = false; const double TimeAxisViewItem::NAME_X_OFFSET = 15.0; const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ; @@ -54,7 +54,6 @@ double TimeAxisViewItem::NAME_Y_OFFSET; double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE; double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH; - //---------------------------------------------------------------------------------------// // Constructor / Desctructor @@ -69,10 +68,10 @@ double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH; * @param start the start point of this item * @param duration the duration of this item */ -TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color, - nframes_t start, nframes_t duration, +TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & base_color, + nframes_t start, nframes_t duration, bool recording, Visibility vis) - : trackview (tv) + : trackview (tv), _recregion(recording) { if (!have_name_font) { @@ -88,10 +87,10 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& int width; int height; - layout->set_font_description (NAME_FONT); + layout->set_font_description (*NAME_FONT); Gtkmm2ext::get_ink_pixel_size (layout, width, height); - NAME_Y_OFFSET = height + 6; + NAME_Y_OFFSET = height + 5; NAME_HIGHLIGHT_SIZE = height + 6; NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2; @@ -105,7 +104,8 @@ TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) - : trackview (other.trackview) + : sigc::trackable(other) + , trackview (other.trackview) { Gdk::Color c; @@ -123,19 +123,16 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) init (other.item_name, other.samples_per_unit, c, other.frame_position, other.item_duration, other.visibility); } - void -TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_color, nframes_t start, nframes_t duration, Visibility vis) +TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color const & base_color, nframes_t start, nframes_t duration, Visibility vis) { item_name = it_name ; - name_text_width = ::pixel_width (it_name, NAME_FONT); - last_name_text_width = 0; samples_per_unit = spu ; should_show_selection = true; frame_position = start ; item_duration = duration ; name_connected = false; - // why? fill_opacity = 60; + fill_opacity = 60; position_locked = false ; max_item_duration = ARDOUR::max_frames; min_item_duration = 0 ; @@ -147,23 +144,17 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo warning << "Time Axis Item Duration == 0" << endl ; } - vestigial_frame = new ArdourCanvas::SimpleRect (*group); - vestigial_frame->property_x1() = (double) 0.0; - vestigial_frame->property_y1() = (double) 1.0; - vestigial_frame->property_x2() = 2.0; - vestigial_frame->property_y2() = (double) trackview.height; + vestigial_frame = new ArdourCanvas::SimpleRect (*group, 0.0, 1.0, 2.0, trackview.current_height()); + vestigial_frame->hide (); + vestigial_frame->property_outline_what() = 0xF; vestigial_frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get(); vestigial_frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_VestigialFrame.get(); - vestigial_frame->hide (); if (visibility & ShowFrame) { - frame = new ArdourCanvas::SimpleRect (*group); - frame->property_x1() = (double) 0.0; - frame->property_y1() = (double) 1.0; - frame->property_x2() = (double) trackview.editor.frame_to_pixel(duration); - frame->property_y2() = (double) trackview.height; + frame = new ArdourCanvas::SimpleRect (*group, 0.0, 1.0, trackview.editor().frame_to_pixel(duration), trackview.current_height()); + frame->property_outline_pixels() = 1; + frame->property_outline_what() = 0xF; frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); - frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); /* by default draw all 4 edges */ @@ -188,19 +179,11 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo } if (visibility & ShowNameHighlight) { - name_highlight = new ArdourCanvas::SimpleRect (*group); if (visibility & FullWidthNameHighlight) { - name_highlight->property_x1() = (double) 0.0; - name_highlight->property_x2() = (double) (trackview.editor.frame_to_pixel(item_duration)); + name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height() - 1); } else { - name_highlight->property_x1() = (double) 1.0; - name_highlight->property_x2() = (double) (trackview.editor.frame_to_pixel(item_duration)) - 1; + name_highlight = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height() - 1); } - name_highlight->property_y1() = (double) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE); - name_highlight->property_y2() = (double) (trackview.height - 1); - name_highlight->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightFill.get(); - name_highlight->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_NameHighlightOutline.get(); - name_highlight->set_data ("timeaxisviewitem", this); } else { @@ -208,39 +191,23 @@ TimeAxisViewItem::init (const string& it_name, double spu, Gdk::Color& base_colo } if (visibility & ShowNameText) { - name_text = new ArdourCanvas::Text (*group); - name_text->property_x() = (double) TimeAxisViewItem::NAME_X_OFFSET; - /* trackview.height is the bottom of the trackview. subtract 1 to get back to the bottom of the highlight, - then NAME_Y_OFFSET to position the text in the vertical center of the highlight - */ - name_text->property_y() = (double) trackview.height - 1.0 - TimeAxisViewItem::NAME_Y_OFFSET; - name_text->property_font_desc() = NAME_FONT; - name_text->property_anchor() = Gtk::ANCHOR_NW; - - name_text->set_data ("timeaxisviewitem", this); - + name_pixbuf = new ArdourCanvas::Pixbuf(*group); + name_pixbuf->property_x() = NAME_X_OFFSET; + name_pixbuf->property_y() = trackview.current_height() - 1.0 - NAME_Y_OFFSET; + } else { - name_text = 0; + name_pixbuf = 0; } /* create our grab handles used for trimming/duration etc */ if (visibility & ShowHandles) { - frame_handle_start = new ArdourCanvas::SimpleRect (*group); - frame_handle_start->property_x1() = (double) 0.0; - frame_handle_start->property_x2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH; - frame_handle_start->property_y1() = (double) 1.0; - frame_handle_start->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH+1; + + frame_handle_start = new ArdourCanvas::SimpleRect (*group, 0.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH, 1.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH+1); frame_handle_start->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get(); - frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get(); - - frame_handle_end = new ArdourCanvas::SimpleRect (*group); - frame_handle_end->property_x1() = (double) (trackview.editor.frame_to_pixel(get_duration())) - (TimeAxisViewItem::GRAB_HANDLE_LENGTH); - frame_handle_end->property_x2() = (double) trackview.editor.frame_to_pixel(get_duration()); - frame_handle_end->property_y1() = (double) 1; - frame_handle_end->property_y2() = (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH + 1; + + frame_handle_end = new ArdourCanvas::SimpleRect (*group, trackview.editor().frame_to_pixel(get_duration()) - TimeAxisViewItem::GRAB_HANDLE_LENGTH, trackview.editor().frame_to_pixel(get_duration()), 1.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH + 1); frame_handle_end->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get(); - frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get(); } else { frame_handle_start = 0; @@ -341,7 +308,7 @@ TimeAxisViewItem::set_duration (nframes_t dur, void* src) item_duration = dur; - reset_width_dependent_items (trackview.editor.frame_to_pixel (dur)); + reset_width_dependent_items (trackview.editor().frame_to_pixel (dur)); DurationChanged (dur, src) ; /* EMIT_SIGNAL */ return true; @@ -439,9 +406,9 @@ TimeAxisViewItem::get_position_locked() const * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_max_duration_active(bool active, void* src) +TimeAxisViewItem::set_max_duration_active (bool active, void* /*src*/) { - max_duration_active = active ; + max_duration_active = active; } /** @@ -462,7 +429,7 @@ TimeAxisViewItem::get_max_duration_active() const * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_min_duration_active(bool active, void* src) +TimeAxisViewItem::set_min_duration_active (bool active, void* /*src*/) { min_duration_active = active ; } @@ -493,7 +460,6 @@ TimeAxisViewItem::set_item_name(std::string new_name, void* src) if (new_name != item_name) { std::string temp_name = item_name ; item_name = new_name ; - name_text_width = ::pixel_width (new_name, NAME_FONT); NameChanged (item_name, temp_name, src) ; /* EMIT_SIGNAL */ } } @@ -561,70 +527,94 @@ TimeAxisViewItem::get_time_axis_view() void TimeAxisViewItem::set_name_text(const ustring& new_name) { - if (name_text) { - name_text->property_text() = new_name; - name_text_width = pixel_width (new_name, NAME_FONT); - name_text_size_cache.clear (); + uint32_t pb_width, it_width; + double font_size; + + font_size = NAME_FONT->get_size() / Pango::SCALE; + it_width = trackview.editor().frame_to_pixel(item_duration); + pb_width = new_name.length() * font_size; + + if (pb_width > it_width - NAME_X_OFFSET) { + pb_width = it_width - NAME_X_OFFSET; + } + + if (pb_width <= 0 || it_width < NAME_X_OFFSET) { + if (name_pixbuf) { + name_pixbuf->hide(); + } + return; + } else { + name_pixbuf->show(); } + + Glib::RefPtr buf = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, 8, pb_width, NAME_HIGHLIGHT_SIZE); + + cairo_surface_t* surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, pb_width, NAME_HIGHLIGHT_SIZE ); + cairo_t *cr = cairo_create (surface); + cairo_text_extents_t te; + cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0); + cairo_select_font_face (cr, NAME_FONT->get_family().c_str(), + CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size (cr, 10); + cairo_text_extents (cr, new_name.c_str(), &te); + + cairo_move_to (cr, 0.5, + 0.5 - te.height / 2 - te.y_bearing + NAME_HIGHLIGHT_SIZE / 2); + cairo_show_text (cr, new_name.c_str()); + + unsigned char* src = cairo_image_surface_get_data (surface); + convert_bgra_to_rgba(src, buf->get_pixels(), pb_width, NAME_HIGHLIGHT_SIZE); + + cairo_destroy(cr); + name_pixbuf->property_pixbuf() = buf; } /** - * Set the y position and height of this item. + * Set the height of this item * - * @param y the new y position * @param h the new height */ void -TimeAxisViewItem::set_y_position_and_height (double y, double h) +TimeAxisViewItem::set_height (double height) { if (name_highlight) { - if (h < NAME_HIGHLIGHT_THRESH) { + if (height < NAME_HIGHLIGHT_THRESH) { name_highlight->hide(); - if (name_text) { - name_text->hide(); - } + name_pixbuf->hide(); + } else { name_highlight->show(); - if (name_text) { - name_text->show(); - } + name_pixbuf->show(); + } - if (h > NAME_HIGHLIGHT_SIZE) { - name_highlight->property_y1() = (double) y + h + 1 - NAME_HIGHLIGHT_SIZE; - name_highlight->property_y2() = (double) y + h; + if (height > NAME_HIGHLIGHT_SIZE) { + name_highlight->property_y1() = (double) height+1 - NAME_HIGHLIGHT_SIZE; + name_highlight->property_y2() = (double) height; } else { /* it gets hidden now anyway */ - name_highlight->property_y1() = (double) y; - name_highlight->property_y2() = (double) y + h; + name_highlight->property_y1() = (double) 1.0; + name_highlight->property_y2() = (double) height; } } - if (name_text) { - name_text->property_y() = y + h + 1 - NAME_Y_OFFSET; - if (h < NAME_HIGHLIGHT_THRESH) { - name_text->property_fill_color_rgba() = fill_color; - } - else { - name_text->property_fill_color_rgba() = label_color; - } + if (visibility & ShowNameText) { + name_pixbuf->property_y() = height+1 - NAME_Y_OFFSET; } if (frame) { - frame->property_y1() = y; - frame->property_y2() = y + h + 1; + frame->property_y2() = height+1; } - vestigial_frame->property_y1() = y; - vestigial_frame->property_y2() = y + h + 1; + vestigial_frame->property_y2() = height+1; } /** * */ void -TimeAxisViewItem::set_color(Gdk::Color& base_color) +TimeAxisViewItem::set_color (Gdk::Color const & base_color) { compute_colors (base_color); set_colors (); @@ -642,7 +632,7 @@ TimeAxisViewItem::get_canvas_frame() /** * */ -ArdourCanvas::Item* +ArdourCanvas::Group* TimeAxisViewItem::get_canvas_group() { return (group) ; @@ -660,10 +650,10 @@ TimeAxisViewItem::get_name_highlight() /** * */ -ArdourCanvas::Text* -TimeAxisViewItem::get_name_text() +ArdourCanvas::Pixbuf* +TimeAxisViewItem::get_name_pixbuf() { - return (name_text) ; + return (name_pixbuf) ; } /** @@ -672,7 +662,7 @@ TimeAxisViewItem::get_name_text() * @param color the base color of the item */ void -TimeAxisViewItem::compute_colors(Gdk::Color& base_color) +TimeAxisViewItem::compute_colors (Gdk::Color const & base_color) { unsigned char radius ; char minor_shift ; @@ -683,7 +673,7 @@ TimeAxisViewItem::compute_colors(Gdk::Color& base_color) r = base_color.get_red()/256 ; g = base_color.get_green()/256 ; b = base_color.get_blue()/256 ; - fill_color = RGBA_TO_UINT(r,g,b,255) ; + fill_color = RGBA_TO_UINT(r,g,b,160) ; /* for minor colors: if the overall saturation is strong, make the minor colors light. @@ -767,20 +757,6 @@ void TimeAxisViewItem::set_colors() { set_frame_color() ; - if (name_text) { - double height = NAME_HIGHLIGHT_THRESH; - - if (frame) { - height = frame->property_y2(); - } - - if (height < NAME_HIGHLIGHT_THRESH) { - name_text->property_fill_color_rgba() = fill_color; - } - else { - name_text->property_fill_color_rgba() = label_color; - } - } if (name_highlight) { name_highlight->property_fill_color_rgba() = fill_color; @@ -802,8 +778,13 @@ TimeAxisViewItem::set_frame_color() UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a); frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a); } else { - UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); - frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a); + if (_recregion) { + UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a); + frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a); + } else { + UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a); + frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a); + } } } } @@ -858,9 +839,7 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (name_highlight) { name_highlight->hide(); - if (name_text) { - name_text->hide(); - } + name_pixbuf->hide(); } if (frame) { @@ -881,13 +860,10 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (height < NAME_HIGHLIGHT_THRESH) { name_highlight->hide(); - if (name_text) { - name_text->hide(); - } + name_pixbuf->hide(); } else { name_highlight->show(); - if (name_text && !get_item_name().empty()) { - name_text->show(); + if (!get_item_name().empty()) { reset_name_width (pixel_width); } } @@ -919,92 +895,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) } void -TimeAxisViewItem::reset_name_width (double pixel_width) +TimeAxisViewItem::reset_name_width (double /*pixel_width*/) { - if (name_text == 0) { - return; - } - - int limit = (int) floor (pixel_width - NAME_X_OFFSET); - bool shrinking = (last_name_text_width > pixel_width); - int actual_width; - ustring ustr; - ustring::size_type n; - - if ((last_name_text_width && // we did this once - shrinking && // we're getting smaller - (name_text_width <= limit) && // fits the new size - (name_text_width <= last_name_text_width - NAME_X_OFFSET))) { // fit into the old size too - last_name_text_width = pixel_width; - return; - } - - /* now check the cache of existing truncations */ - - Gtk::Label foo; - Glib::RefPtr layout = foo.create_pango_layout (""); - - for (n = item_name.length(); n > 0; --n) { - - map::iterator i; - - if ((i = name_text_size_cache.find (n)) != name_text_size_cache.end()) { - - /* we know the length of this substring already */ - - if ((actual_width = (*i).second) < limit) { - - /* it fits, use it */ - - ustr = item_name.substr (0, n); - break; - } - - } else { - - /* we don't know the length of this substring already, so compute - it and put it into the cache. - */ - - layout->set_text (item_name.substr (0, n)); - - int width, height; - Gtkmm2ext::get_ink_pixel_size (layout, width, height); - - name_text_size_cache[n] = width; - - if ((actual_width = width) < limit) { - ustr = item_name.substr (0, n); - break; - } - } - } - - if (n == 0) { - name_text->property_text() = ""; - last_name_text_width = pixel_width; - return; - } - - /* don't use name for event handling if it leaves no room - for trimming to work. - */ - - if (pixel_width - actual_width < (NAME_X_OFFSET * 2.0)) { - if (name_connected) { - name_connected = false; - } - } else { - if (!name_connected) { - name_connected = true; - } - } - - name_text->property_text() = ustr; - name_text_width = actual_width; - name_text->show(); - last_name_text_width = pixel_width; - + set_name_text (item_name); } @@ -1047,3 +940,15 @@ TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src) item = 0; return false; } + +void +TimeAxisViewItem::set_y (double y) +{ + double const old = group->property_y (); + if (y != old) { + group->move (0, y - old); + } +} + + +