X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=d9b0bfa2cf42c972612d6ea9953f7a898df24afa;hb=0938a42440cc82ce8d0cb064840c258c863714ab;hp=1e75a7845ea5f1d6d4c60a76844c052dc36b1754;hpb=918371d52a90cb6027bd808188b2df78c0d3017a;p=ardour.git diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 1e75a7845e..d9b0bfa2cf 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,7 +23,15 @@ #include "ardour/types.h" #include "ardour/ardour.h" -#include +#include "gtkmm2ext/utils.h" +#include "gtkmm2ext/gui_thread.h" + +#include "ardour_ui.h" +/* + * ardour_ui.h was moved up in the include list + * due to a conflicting definition of 'Rect' between + * Apple's MacTypes.h file and GTK + */ #include "public_editor.h" #include "time_axis_view_item.h" @@ -32,7 +40,6 @@ #include "utils.h" #include "canvas_impl.h" #include "rgb_macros.h" -#include "ardour_ui.h" #include "i18n.h" @@ -41,72 +48,72 @@ using namespace Editing; using namespace Glib; using namespace PBD; using namespace ARDOUR; +using namespace Gtkmm2ext; -//------------------------------------------------------------------------------ -/** Initialize const static memeber data */ - -Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0; -bool TimeAxisViewItem::have_name_font = false; +Pango::FontDescription TimeAxisViewItem::NAME_FONT; const double TimeAxisViewItem::NAME_X_OFFSET = 15.0; -const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ; +const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6; +int TimeAxisViewItem::NAME_HEIGHT; double TimeAxisViewItem::NAME_Y_OFFSET; double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE; double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH; +void +TimeAxisViewItem::set_constant_heights () +{ + NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName")); -//---------------------------------------------------------------------------------------// -// Constructor / Desctructor + Gtk::Window win; + Gtk::Label foo; + win.add (foo); + + Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ + int width = 0; + int height = 0; + + layout->set_font_description (NAME_FONT); + Gtkmm2ext::get_ink_pixel_size (layout, width, height); + + NAME_HEIGHT = height; + NAME_Y_OFFSET = height + 3; + NAME_HIGHLIGHT_SIZE = height + 2; + NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3; +} /** - * Constructs a new TimeAxisViewItem. + * Construct a new TimeAxisViewItem. * - * @param it_name the unique name/Id of this item - * @param parant the parent canvas group + * @param it_name the unique name of this item + * @param parent the parent canvas group * @param tv the TimeAxisView we are going to be added to * @param spu samples per unit * @param base_color * @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, bool recording, - Visibility vis) - : trackview (tv), _recregion(recording) + * @param recording true if this is a recording region view + * @param automation true if this is an automation region view + */ +TimeAxisViewItem::TimeAxisViewItem( + const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & base_color, + framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis + ) + : trackview (tv) + , _height (1.0) + , _recregion (recording) + , _automation (automation) { - if (!have_name_font) { - - /* first constructed item sets up font info */ - - NAME_FONT = get_font_for_style (N_("TimeAxisViewItemName")); - - Gtk::Window win; - Gtk::Label foo; - win.add (foo); - - Glib::RefPtr layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */ - int width; - int height; - - layout->set_font_description (*NAME_FONT); - Gtkmm2ext::get_ink_pixel_size (layout, width, height); - - NAME_Y_OFFSET = height + 5; - NAME_HIGHLIGHT_SIZE = height + 6; - NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2; - - have_name_font = true; - } - group = new ArdourCanvas::Group (parent); - - init (it_name, spu, base_color, start, duration, vis); + init (it_name, spu, base_color, start, duration, vis, true, true); } TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) - : sigc::trackable(other) + : Selectable (other) + , PBD::ScopedConnectionList() , trackview (other.trackview) + , _recregion (other._recregion) + , _automation (other._automation) { Gdk::Color c; @@ -118,168 +125,158 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other) /* share the other's parent, but still create a new group */ Gnome::Canvas::Group* parent = other.group->property_parent(); - + group = new ArdourCanvas::Group (*parent); - init (other.item_name, other.samples_per_unit, c, other.frame_position, other.item_duration, other.visibility); -} + _selected = other._selected; + init ( + other.item_name, other.samples_per_unit, c, other.frame_position, + other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name + ); +} 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, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high) { - 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 ; + item_name = it_name; + samples_per_unit = spu; + frame_position = start; + item_duration = duration; name_connected = false; fill_opacity = 60; - position_locked = false ; - max_item_duration = ARDOUR::max_frames; - min_item_duration = 0 ; + position_locked = false; + max_item_duration = ARDOUR::max_framepos; + min_item_duration = 0; show_vestigial = true; visibility = vis; _sensitive = true; + name_pixbuf_width = 0; + last_item_width = 0; + wide_enough_for_name = wide; + high_enough_for_name = high; + rect_visible = true; if (duration == 0) { - warning << "Time Axis Item Duration == 0" << endl ; + 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() = (double) 2.0; - vestigial_frame->property_y2() = (double) trackview.current_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.current_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(); - - /* by default draw all 4 edges */ - - uint32_t outline_what = 0x1|0x2|0x4|0x8; - if (visibility & HideFrameLeft) { - outline_what &= ~(0x1); - } - - if (visibility & HideFrameRight) { - outline_what &= ~(0x2); + if (_recregion) { + frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); + } else { + frame->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); } - if (visibility & HideFrameTB) { - outline_what &= ~(0x4 | 0x8); - } + frame->property_outline_what() = 0x1|0x2|0x4|0x8; - frame->property_outline_what() = outline_what; - } else { frame = 0; } 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()); } 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()); } - name_highlight->property_y1() = (double) (trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE); - name_highlight->property_y2() = (double) (trackview.current_height() - 1); name_highlight->set_data ("timeaxisviewitem", this); + name_highlight->property_outline_what() = 0x4; + /* we should really use a canvas color property here */ + name_highlight->property_outline_color_rgba() = RGBA_TO_UINT (0,0,0,255); } else { name_highlight = 0; } if (visibility & ShowNameText) { - name_text = new ArdourCanvas::Text (*group); - name_text->property_x() = (double) TimeAxisViewItem::NAME_X_OFFSET; - /* trackview.current_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.current_height() - 1.0 - TimeAxisViewItem::NAME_Y_OFFSET; - name_text->property_font_desc() = *NAME_FONT; - name_text->property_anchor() = Gtk::ANCHOR_NW; + name_pixbuf = new ArdourCanvas::Pixbuf(*group); + name_pixbuf->property_x() = NAME_X_OFFSET; + name_pixbuf->property_y() = trackview.current_height() + 1 - NAME_Y_OFFSET; - name_text->set_data ("timeaxisviewitem", this); - } 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->property_outline_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->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_FrameHandle.get(); - + if (!_recregion && !_automation) { + frame_handle_start = new ArdourCanvas::SimpleRect (*group, 0.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH, 5.0, trackview.current_height()); + frame_handle_start->property_outline_what() = 0x0; + frame_handle_end = new ArdourCanvas::SimpleRect (*group, 0.0, TimeAxisViewItem::GRAB_HANDLE_LENGTH, 5.0, trackview.current_height()); + frame_handle_end->property_outline_what() = 0x0; } else { - frame_handle_start = 0; - frame_handle_end = 0; + frame_handle_start = frame_handle_end = 0; } - set_color (base_color) ; + set_color (base_color); - set_duration (item_duration, this) ; - set_position (start, this) ; + set_duration (item_duration, this); + set_position (start, this); + + Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ()); } -/** - * Destructor - */ TimeAxisViewItem::~TimeAxisViewItem() { delete group; } +void +TimeAxisViewItem::hide_rect () +{ + rect_visible = false; + set_frame_color (); + + if (name_highlight) { + name_highlight->property_outline_what() = 0x0; + name_highlight->property_fill_color_rgba() = UINT_RGBA_CHANGE_A(fill_color,64); + } +} + +void +TimeAxisViewItem::show_rect () +{ + rect_visible = true; + set_frame_color (); + + if (name_highlight) { + name_highlight->property_outline_what() = 0x4; + name_highlight->property_fill_color_rgba() = fill_color; + } +} -//---------------------------------------------------------------------------------------// -// Position and duration Accessors/Mutators /** - * Set the position of this item upon the timeline to the specified value + * Set the position of this item on the timeline. * * @param pos the new position * @param src the identity of the object that initiated the change - * @return true if the position change was a success, false otherwise + * @return true on success */ + bool -TimeAxisViewItem::set_position(nframes_t pos, void* src, double* delta) +TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta) { if (position_locked) { return false; } frame_position = pos; - + /* This sucks. The GnomeCanvas version I am using doesn't correctly implement gnome_canvas_group_set_arg(), so that simply setting the "x" arg of the group @@ -288,45 +285,42 @@ TimeAxisViewItem::set_position(nframes_t pos, void* src, double* delta) thing. I see that in GNOME CVS, the current (Sept 2001) version of GNOME Canvas rectifies this issue cleanly. */ - - double old_unit_pos ; - double new_unit_pos = pos / samples_per_unit ; + + double old_unit_pos; + double new_unit_pos = pos / samples_per_unit; old_unit_pos = group->property_x(); if (new_unit_pos != old_unit_pos) { group->move (new_unit_pos - old_unit_pos, 0.0); } - + if (delta) { (*delta) = new_unit_pos - old_unit_pos; } - - PositionChanged (frame_position, src) ; /* EMIT_SIGNAL */ + + PositionChanged (frame_position, src); /* EMIT_SIGNAL */ return true; } -/** - * Return the position of this item upon the timeline - * - * @return the position of this item - */ -nframes_t +/** @return position of this item on the timeline */ +framepos_t TimeAxisViewItem::get_position() const { return frame_position; } /** - * Sets the duration of this item + * Set the duration of this item. * * @param dur the new duration of this item * @param src the identity of the object that initiated the change - * @return true if the duration change was succesful, false otherwise + * @return true on success */ + bool -TimeAxisViewItem::set_duration (nframes_t dur, void* src) +TimeAxisViewItem::set_duration (framepos_t dur, void* src) { if ((dur > max_item_duration) || (dur < min_item_duration)) { warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur) @@ -339,183 +333,149 @@ TimeAxisViewItem::set_duration (nframes_t dur, void* src) } item_duration = dur; - + reset_width_dependent_items (trackview.editor().frame_to_pixel (dur)); - - DurationChanged (dur, src) ; /* EMIT_SIGNAL */ + + DurationChanged (dur, src); /* EMIT_SIGNAL */ return true; } -/** - * Returns the duration of this item - * - */ -nframes_t +/** @return duration of this item */ +framepos_t TimeAxisViewItem::get_duration() const { - return (item_duration); + return item_duration; } /** - * Sets the maximum duration that this item make have. + * Set the maximum duration that this item can have. * * @param dur the new maximum duration * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_max_duration(nframes_t dur, void* src) +TimeAxisViewItem::set_max_duration(framecnt_t dur, void* src) { - max_item_duration = dur ; - MaxDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */ + max_item_duration = dur; + MaxDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */ } - -/** - * Returns the maxmimum duration that this item may be set to - * - * @return the maximum duration that this item may be set to - */ -nframes_t + +/** @return the maximum duration that this item may have */ +framecnt_t TimeAxisViewItem::get_max_duration() const { - return (max_item_duration) ; + return max_item_duration; } /** - * Sets the minimu duration that this item may be set to + * Set the minimum duration that this item may have. * * @param the minimum duration that this item may be set to * @param src the identity of the object that initiated the change */ void -TimeAxisViewItem::set_min_duration(nframes_t dur, void* src) +TimeAxisViewItem::set_min_duration(framecnt_t dur, void* src) { - min_item_duration = dur ; - MinDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */ + min_item_duration = dur; + MinDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */ } - -/** - * Returns the minimum duration that this item mey be set to - * - * @return the nimum duration that this item mey be set to - */ -nframes_t + +/** @return the minimum duration that this item mey have */ +framecnt_t TimeAxisViewItem::get_min_duration() const { - return(min_item_duration) ; + return min_item_duration; } /** - * Sets whether the position of this Item is locked to its current position + * Set whether this item is locked to its current position. * Locked items cannot be moved until the item is unlocked again. * - * @param yn set to true to lock this item to its current position + * @param yn true to lock this item to its current position * @param src the identity of the object that initiated the change */ void TimeAxisViewItem::set_position_locked(bool yn, void* src) { - position_locked = yn ; - set_trim_handle_colors() ; + position_locked = yn; + set_trim_handle_colors(); PositionLockChanged (position_locked, src); /* EMIT_SIGNAL */ } -/** - * Returns whether this item is locked to its current position - * - * @return true if this item is locked to its current posotion - * false otherwise - */ +/** @return true if this item is locked to its current position */ bool TimeAxisViewItem::get_position_locked() const { - return (position_locked); + return position_locked; } /** - * Sets whether the Maximum Duration constraint is active and should be enforced + * Set whether the maximum duration constraint is active. * * @param active set true to enforce the max duration constraint * @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; } - -/** - * Returns whether the Maximum Duration constraint is active and should be enforced - * - * @return true if the maximum duration constraint is active, false otherwise - */ + +/** @return true if the maximum duration constraint is active */ bool TimeAxisViewItem::get_max_duration_active() const { - return(max_duration_active) ; + return max_duration_active; } - + /** - * Sets whether the Minimum Duration constraint is active and should be enforced + * Set whether the minimum duration constraint is active. * * @param active set true to enforce the min duration constraint * @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 ; + min_duration_active = active; } - -/** - * Returns whether the Maximum Duration constraint is active and should be enforced - * - * @return true if the maximum duration constraint is active, false otherwise - */ + +/** @return true if the maximum duration constraint is active */ bool TimeAxisViewItem::get_min_duration_active() const { - return(min_duration_active) ; + return min_duration_active; } -//---------------------------------------------------------------------------------------// -// Name/Id Accessors/Mutators - /** - * Set the name/Id of this item. + * Set the name of this item. * * @param new_name the new name of this item * @param src the identity of the object that initiated the change */ + void 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 */ + std::string temp_name = item_name; + item_name = new_name; + NameChanged (item_name, temp_name, src); /* EMIT_SIGNAL */ } } -/** - * Returns the name/id of this item - * - * @return the name/id of this item - */ +/** @return the name of this item */ std::string TimeAxisViewItem::get_item_name() const { - return(item_name) ; + return item_name; } -//---------------------------------------------------------------------------------------// -// Selection Methods - /** - * Set to true to indicate that this item is currently selected + * Set selection status. * * @param yn true if this item is currently selected - * @param src the identity of the object that initiated the change */ void TimeAxisViewItem::set_selected(bool yn) @@ -526,71 +486,56 @@ TimeAxisViewItem::set_selected(bool yn) } } -void -TimeAxisViewItem::set_should_show_selection (bool yn) -{ - if (should_show_selection != yn) { - should_show_selection = yn; - set_frame_color (); - } -} - -//---------------------------------------------------------------------------------------// -// Parent Componenet Methods - -/** - * Returns the TimeAxisView that this item is upon - * - * @return the timeAxisView that this item is placed upon - */ +/** @return the TimeAxisView that this item is on */ TimeAxisView& -TimeAxisViewItem::get_time_axis_view() +TimeAxisViewItem::get_time_axis_view () const { return trackview; -} -//---------------------------------------------------------------------------------------// -// ui methods & data +} /** - * Sets the displayed item text - * This item is the visual text name displayed on the canvas item, this can be different to the name of the item + * Set the displayed item text. + * This item is the visual text name displayed on the canvas item, this can be different to the name of the item. * * @param new_name the new name text to display */ + void -TimeAxisViewItem::set_name_text(const ustring& new_name) +TimeAxisViewItem::set_name_text(const string& 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 (); + if (!name_pixbuf) { + return; } + + last_item_width = trackview.editor().frame_to_pixel(item_duration); + name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2; + name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000")); } + /** - * Set the height of this item + * Set the height of this item. * - * @param h the new height - */ + * @param h new height + */ void TimeAxisViewItem::set_height (double height) { + _height = height; + if (name_highlight) { if (height < NAME_HIGHLIGHT_THRESH) { - name_highlight->hide(); - if (name_text) { - name_text->hide(); - } + name_highlight->hide (); + high_enough_for_name = false; + } else { name_highlight->show(); - if (name_text) { - name_text->show(); - } + high_enough_for_name = true; } if (height > NAME_HIGHLIGHT_SIZE) { - name_highlight->property_y1() = (double) height+1 - NAME_HIGHLIGHT_SIZE; - name_highlight->property_y2() = (double) height; + name_highlight->property_y1() = (double) height - 1 - NAME_HIGHLIGHT_SIZE; + name_highlight->property_y2() = (double) height - 1; } else { /* it gets hidden now anyway */ @@ -599,105 +544,91 @@ TimeAxisViewItem::set_height (double height) } } - if (name_text) { - name_text->property_y() = height+1 - NAME_Y_OFFSET; - if (height < 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_y2() = height+1; + frame->property_y2() = height - 1; + if (frame_handle_start) { + frame_handle_start->property_y2() = height - 1; + frame_handle_end->property_y2() = height - 1; + } } - vestigial_frame->property_y2() = height+1; + vestigial_frame->property_y2() = height - 1; + + update_name_pixbuf_visibility (); + set_colors (); } -/** - * - */ void -TimeAxisViewItem::set_color(Gdk::Color& base_color) +TimeAxisViewItem::set_color (Gdk::Color const & base_color) { compute_colors (base_color); set_colors (); } -/** - * - */ ArdourCanvas::Item* TimeAxisViewItem::get_canvas_frame() { - return(frame) ; + return frame; } -/** - * - */ ArdourCanvas::Group* TimeAxisViewItem::get_canvas_group() { - return (group) ; + return group; } -/** - * - */ ArdourCanvas::Item* TimeAxisViewItem::get_name_highlight() { - return (name_highlight) ; + return name_highlight; } -/** - * - */ -ArdourCanvas::Text* -TimeAxisViewItem::get_name_text() +ArdourCanvas::Pixbuf* +TimeAxisViewItem::get_name_pixbuf() { - return (name_text) ; + return name_pixbuf; } /** - * Calculates some contrasting color for displaying various parts of this item, based upon the base color + * Calculate some contrasting color for displaying various parts of this item, based upon the base color. * * @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 ; - - unsigned char r,g,b ; + unsigned char radius; + char minor_shift; + + unsigned char r,g,b; /* FILL: this is simple */ - 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,160) ; + 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,160); /* for minor colors: if the overall saturation is strong, make the minor colors light. if its weak, make them dark. - + we do this by moving an equal distance to the other side of the central circle in the color wheel from where we started. */ - radius = (unsigned char) rint (floor (sqrt (static_cast(r*r + g*g + b+b))/3.0f)) ; - minor_shift = 125 - radius ; + radius = (unsigned char) rint (floor (sqrt (static_cast(r*r + g*g + b+b))/3.0f)); + minor_shift = 125 - radius; /* LABEL: rotate around color wheel by 120 degrees anti-clockwise */ r = base_color.get_red()/256; g = base_color.get_green()/256; b = base_color.get_blue()/256; - + if (r > b) { if (r > g) @@ -709,7 +640,7 @@ TimeAxisViewItem::compute_colors(Gdk::Color& base_color) { /* green sector => blue */ swap (g,b); - } + } } else { @@ -728,30 +659,30 @@ TimeAxisViewItem::compute_colors(Gdk::Color& base_color) r += minor_shift; b += minor_shift; g += minor_shift; - + label_color = RGBA_TO_UINT(r,g,b,255); - r = (base_color.get_red()/256) + 127 ; - g = (base_color.get_green()/256) + 127 ; - b = (base_color.get_blue()/256) + 127 ; - + r = (base_color.get_red()/256) + 127; + g = (base_color.get_green()/256) + 127; + b = (base_color.get_blue()/256) + 127; + label_color = RGBA_TO_UINT(r,g,b,255); /* XXX can we do better than this ? */ - /* We're trying ;) */ + /* We're trying;) */ /* NUKECOLORS */ - + //frame_color_r = 192; //frame_color_g = 192; //frame_color_b = 194; - + //selected_frame_color_r = 182; //selected_frame_color_g = 145; //selected_frame_color_b = 168; - - //handle_color_r = 25 ; - //handle_color_g = 0 ; - //handle_color_b = 255 ; - //lock_handle_color_r = 235 ; + + //handle_color_r = 25; + //handle_color_g = 0; + //handle_color_b = 255; + //lock_handle_color_r = 235; //lock_handle_color_g = 16; //lock_handle_color_b = 16; } @@ -762,27 +693,12 @@ TimeAxisViewItem::compute_colors(Gdk::Color& base_color) 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; - } - } + set_frame_color(); if (name_highlight) { name_highlight->property_fill_color_rgba() = fill_color; - name_highlight->property_outline_color_rgba() = fill_color; } - set_trim_handle_colors() ; + set_trim_handle_colors(); } /** @@ -791,27 +707,65 @@ TimeAxisViewItem::set_colors() void TimeAxisViewItem::set_frame_color() { - if (frame) { - uint32_t r,g,b,a; - - if (_selected && should_show_selection) { - 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); + uint32_t f = 0; + + if (!frame) { + return; + } + + if (_selected) { + + f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); + + if (fill_opacity) { + f = UINT_RGBA_CHANGE_A (f, fill_opacity); + } + + if (!rect_visible) { + f = UINT_RGBA_CHANGE_A (f, 0); + } + + } else { + + if (_recregion) { + f = ARDOUR_UI::config()->canvasvar_RecordingRect.get(); } else { - 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); + + if (high_enough_for_name && !Config->get_color_regions_using_track_color()) { + f = ARDOUR_UI::config()->canvasvar_FrameBase.get(); } 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); + f = fill_color; } - } + + if (fill_opacity) { + f = UINT_RGBA_CHANGE_A (f, fill_opacity); + } + + if (!rect_visible) { + f = UINT_RGBA_CHANGE_A (f, 0); + } + } } + + frame->property_fill_color_rgba() = f; + + if (!_recregion) { + if (_selected) { + f = ARDOUR_UI::config()->canvasvar_SelectedTimeAxisFrame.get(); + } else { + f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get(); + } + + if (!rect_visible) { + f = UINT_RGBA_CHANGE_A (f, 64); + } + + frame->property_outline_color_rgba() = f; + } } /** - * Sets the colors of the start and end trim handle depending on object state - * + * Set the colors of the start and end trim handle depending on object state */ void TimeAxisViewItem::set_trim_handle_colors() @@ -819,24 +773,32 @@ TimeAxisViewItem::set_trim_handle_colors() if (frame_handle_start) { if (position_locked) { frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get(); - frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get(); + frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get(); } else { - frame_handle_start->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get(); - frame_handle_end->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_TrimHandle.get(); + frame_handle_start->property_fill_color_rgba() = RGBA_TO_UINT(1, 1, 1, 0); //ARDOUR_UI::config()->canvasvar_TrimHandle.get(); + frame_handle_end->property_fill_color_rgba() = RGBA_TO_UINT(1, 1, 1, 0); //ARDOUR_UI::config()->canvasvar_TrimHandle.get(); } } } +/** @return the samples per unit of this item */ double TimeAxisViewItem::get_samples_per_unit() { - return(samples_per_unit) ; + return samples_per_unit; } +/** + * Set the samples per unit of this item. + * This item is used to determine the relative visual size and position of this item + * based upon its duration and start value. + * + * @param spu the new samples per unit value + */ void TimeAxisViewItem::set_samples_per_unit (double spu) { - samples_per_unit = spu ; + samples_per_unit = spu; set_position (this->get_position(), this); reset_width_dependent_items ((double)get_duration() / samples_per_unit); } @@ -851,7 +813,9 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame_handle_end->hide(); } - } if (pixel_width < 2.0) { + } + + if (pixel_width < 2.0) { if (show_vestigial) { vestigial_frame->show(); @@ -859,9 +823,6 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) if (name_highlight) { name_highlight->hide(); - if (name_text) { - name_text->hide(); - } } if (frame) { @@ -872,33 +833,26 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame_handle_start->hide(); frame_handle_end->hide(); } - + + wide_enough_for_name = false; + } else { vestigial_frame->hide(); if (name_highlight) { - double height = name_highlight->property_y2 (); - - if (height < NAME_HIGHLIGHT_THRESH) { + if (_height < NAME_HIGHLIGHT_THRESH) { name_highlight->hide(); - if (name_text) { - name_text->hide(); - } + high_enough_for_name = false; } else { name_highlight->show(); - if (name_text && !get_item_name().empty()) { - name_text->show(); + if (!get_item_name().empty()) { reset_name_width (pixel_width); } + high_enough_for_name = true; } - if (visibility & FullWidthNameHighlight) { - name_highlight->property_x2() = pixel_width; - } else { - name_highlight->property_x2() = pixel_width - 1.0; - } - + name_highlight->property_x2() = pixel_width; } if (frame) { @@ -916,134 +870,66 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width) frame_handle_end->show(); frame_handle_end->property_x2() = pixel_width; } + + wide_enough_for_name = true; } + + update_name_pixbuf_visibility (); } void -TimeAxisViewItem::reset_name_width (double pixel_width) +TimeAxisViewItem::reset_name_width (double /*pixel_width*/) { - if (name_text == 0) { - return; - } + uint32_t it_width; + int pb_width; + bool pixbuf_holds_full_name; - 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; + if (!name_pixbuf) { 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; + it_width = trackview.editor().frame_to_pixel(item_duration); + pb_width = name_pixbuf_width; - if ((i = name_text_size_cache.find (n)) != name_text_size_cache.end()) { + pixbuf_holds_full_name = last_item_width > pb_width + NAME_X_OFFSET; + last_item_width = it_width; - /* 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 (pixbuf_holds_full_name && (it_width >= pb_width + NAME_X_OFFSET)) { + /* + we've previously had the full name length showing + and its still showing. + */ + return; } - if (n == 0) { - name_text->property_text() = ""; - last_name_text_width = pixel_width; - return; - } + if (pb_width > it_width - NAME_X_OFFSET) { + pb_width = it_width - NAME_X_OFFSET; + } - /* 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; - } + if (it_width <= NAME_X_OFFSET) { + wide_enough_for_name = false; } else { - if (!name_connected) { - name_connected = true; - } + wide_enough_for_name = true; } - - name_text->property_text() = ustr; - name_text_width = actual_width; - name_text->show(); - last_name_text_width = pixel_width; - -} - -//---------------------------------------------------------------------------------------// -// Handle time axis removal - -/** - * Handles the Removal of this time axis item - * This _needs_ to be called to alert others of the removal properly, ie where the source - * of the removal came from. - * - * XXX Although im not too happy about this method of doing things, I cant think of a cleaner method - * just now to capture the source of the removal - * - * @param src the identity of the object that initiated the change - */ -void -TimeAxisViewItem::remove_this_item(void* src) -{ - /* - defer to idle loop, otherwise we'll delete this object - while we're still inside this function ... - */ - Glib::signal_idle().connect(bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src)); + update_name_pixbuf_visibility (); + if (pb_width > 0) { + name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000")); + } } /** - * Callback used to remove this time axis item during the gtk idle loop + * Callback used to remove this time axis item during the gtk idle loop. * This is used to avoid deleting the obejct while inside the remove_this_item - * method + * method. * - * @param item the TimeAxisViewItem to remove - * @param src the identity of the object that initiated the change + * @param item the TimeAxisViewItem to remove. + * @param src the identity of the object that initiated the change. */ gint TimeAxisViewItem::idle_remove_this_item(TimeAxisViewItem* item, void* src) { - item->ItemRemoved (item->get_item_name(), src) ; /* EMIT_SIGNAL */ + item->ItemRemoved (item->get_item_name(), src); /* EMIT_SIGNAL */ delete item; item = 0; return false; @@ -1058,5 +944,24 @@ TimeAxisViewItem::set_y (double y) } } +void +TimeAxisViewItem::update_name_pixbuf_visibility () +{ + if (!name_pixbuf) { + return; + } + + if (wide_enough_for_name && high_enough_for_name) { + name_pixbuf->show (); + } else { + name_pixbuf->hide (); + } +} - +void +TimeAxisViewItem::parameter_changed (string p) +{ + if (p == "color-regions-using-track-color") { + set_frame_color (); + } +}