*/
+#include <utility>
+
#include "pbd/error.h"
#include "pbd/stacktrace.h"
#include "canvas/group.h"
#include "canvas/rectangle.h"
#include "canvas/debug.h"
-#include "canvas/pixbuf.h"
+#include "canvas/drag_handle.h"
+#include "canvas/text.h"
+#include "canvas/utils.h"
#include "ardour_ui.h"
/*
Pango::FontDescription TimeAxisViewItem::NAME_FONT;
const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
-const double TimeAxisViewItem::GRAB_HANDLE_TOP = 6;
-const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 5;
+const double TimeAxisViewItem::GRAB_HANDLE_TOP = 0.0;
+const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 10.0;
+const double TimeAxisViewItem::RIGHT_EDGE_SHIFT = 1.0;
int TimeAxisViewItem::NAME_HEIGHT;
double TimeAxisViewItem::NAME_Y_OFFSET;
int height = 0;
layout->set_font_description (NAME_FONT);
- Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+ get_pixel_size (layout, width, height);
+
+ layout = foo.create_pango_layout (X_("H")); /* just the ascender */
NAME_HEIGHT = height;
- NAME_Y_OFFSET = height + 3;
+ NAME_Y_OFFSET = height + 1;
NAME_HIGHLIGHT_SIZE = height + 2;
NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
}
framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
)
: trackview (tv)
+ , frame_position (-1)
+ , item_name (it_name)
, _height (1.0)
, _recregion (recording)
, _automation (automation)
, _dragging (false)
+ , _width (0.0)
{
- group = new ArdourCanvas::Group (&parent);
- CANVAS_DEBUG_NAME (group, "TAVI group");
-
- init (it_name, spu, base_color, start, duration, vis, true, true);
+ init (&parent, spu, base_color, start, duration, vis, true, true);
}
TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
, Selectable (other)
, PBD::ScopedConnectionList()
, trackview (other.trackview)
+ , frame_position (-1)
+ , item_name (other.item_name)
+ , _height (1.0)
, _recregion (other._recregion)
, _automation (other._automation)
, _dragging (other._dragging)
+ , _width (0.0)
{
Gdk::Color c;
/* share the other's parent, but still create a new group */
ArdourCanvas::Group* parent = other.group->parent();
-
- group = new ArdourCanvas::Group (parent);
-
+
_selected = other._selected;
-
- init (other.item_name, other.frames_per_pixel, c, other.frame_position,
+
+ init (parent, other.samples_per_pixel, 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 fpp, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high)
+TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color,
+ framepos_t start, framepos_t duration, Visibility vis,
+ bool wide, bool high)
{
- item_name = it_name;
- frames_per_pixel = fpp;
+ group = new ArdourCanvas::Group (parent);
+ CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
+ group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
+
+ samples_per_pixel = fpp;
frame_position = start;
item_duration = duration;
name_connected = false;
show_vestigial = true;
visibility = vis;
_sensitive = true;
- name_pixbuf_width = 0;
+ name_text_width = 0;
last_item_width = 0;
wide_enough_for_name = wide;
high_enough_for_name = high;
}
vestigial_frame = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, 1.0, 2.0, trackview.current_height()));
+ CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
vestigial_frame->hide ();
- vestigial_frame->set_outline_what (0xF);
- vestigial_frame->set_outline_color (ARDOUR_UI::config()->canvasvar_VestigialFrame.get());
- vestigial_frame->set_fill_color (ARDOUR_UI::config()->canvasvar_VestigialFrame.get());
+ vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
+ vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_canvasvar_VestigialFrame());
if (visibility & ShowFrame) {
frame = new ArdourCanvas::Rectangle (group,
- ArdourCanvas::Rect (0.0, 1.0,
- trackview.editor().frame_to_pixel(duration),
- trackview.current_height()));
+ ArdourCanvas::Rect (0.0, 0.0,
+ trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT,
+ trackview.current_height() - 1.0));
- frame->set_outline_width (1);
- frame->set_outline_what (0xF);
+ CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
+
+ frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
if (_recregion) {
- frame->set_outline_color (ARDOUR_UI::config()->canvasvar_RecordingRect.get());
+ frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
} else {
- frame->set_outline_color (ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get());
+ frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
}
- frame->set_outline_what (0x1|0x2|0x4|0x8);
+ frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::LEFT));
} else {
+
frame = 0;
}
-
+
if (visibility & ShowNameHighlight) {
+ double width;
+ double start;
+
if (visibility & FullWidthNameHighlight) {
- name_highlight = new ArdourCanvas::Rectangle (group,
- ArdourCanvas::Rect (0.0, trackview.editor().frame_to_pixel(item_duration),
- trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height()));
+ start = 0.0;
+ width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT;
} else {
- name_highlight = new ArdourCanvas::Rectangle (group,
- ArdourCanvas::Rect (1.0, trackview.editor().frame_to_pixel(item_duration) - 1,
- trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height()));
+ start = 1.0;
+ width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT;
}
+ name_highlight = new ArdourCanvas::Rectangle (group,
+ ArdourCanvas::Rect (start,
+ trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE,
+ width - 2.0 + RIGHT_EDGE_SHIFT,
+ trackview.current_height() - 1.0));
+ CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
name_highlight->set_data ("timeaxisviewitem", this);
- name_highlight->set_outline_what (0x4);
- /* we should really use a canvas color property here */
+ name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
} else {
}
if (visibility & ShowNameText) {
- name_pixbuf = new ArdourCanvas::Pixbuf(group);
- name_pixbuf->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() + 1 - NAME_Y_OFFSET));
-
+ name_text = new ArdourCanvas::Text (group);
+ CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
+ name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
+ name_text->set_font_description (NAME_FONT);
} else {
- name_pixbuf = 0;
+ name_text = 0;
}
/* create our grab handles used for trimming/duration etc */
double top = TimeAxisViewItem::GRAB_HANDLE_TOP;
double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
- frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
- frame_handle_start->set_outline_what (0x0);
- frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
- frame_handle_end->set_outline_what (0x0);
+ frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
+ CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start");
+ frame_handle_start->set_outline (false);
+ frame_handle_start->set_fill (false);
+ frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_start));
+
+ frame_handle_end = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
+ CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
+ frame_handle_end->set_outline (false);
+ frame_handle_end->set_fill (false);
+ frame_handle_end->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_end));
} else {
frame_handle_start = frame_handle_end = 0;
}
set_position (start, this);
Config->ParameterChanged.connect (*this, invalidator (*this), boost::bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
+ ARDOUR_UI::config()->ParameterChanged.connect (sigc::mem_fun (*this, &TimeAxisViewItem::parameter_changed));
}
TimeAxisViewItem::~TimeAxisViewItem()
delete group;
}
+bool
+TimeAxisViewItem::canvas_group_event (GdkEvent* /*ev*/)
+{
+ return false;
+}
+
void
TimeAxisViewItem::hide_rect ()
{
set_frame_color ();
if (name_highlight) {
- name_highlight->set_outline_what (0);
+ name_highlight->set_outline_what (ArdourCanvas::Rectangle::What (0));
name_highlight->set_fill_color (UINT_RGBA_CHANGE_A (fill_color, 64));
}
}
set_frame_color ();
if (name_highlight) {
- name_highlight->set_outline_what (0x4);
+ name_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
name_highlight->set_fill_color (fill_color);
}
}
-
/**
* Set the position of this item on the timeline.
*
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
- fails to move the group. Instead, we have to
- use gnome_canvas_item_move(), which does the right
- 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 / frames_per_pixel;
-
- old_unit_pos = group->position().x;
-
- if (new_unit_pos != old_unit_pos) {
- group->set_x_position (new_unit_pos);
- }
+ double new_unit_pos = trackview.editor().sample_to_pixel (pos);
if (delta) {
- (*delta) = new_unit_pos - old_unit_pos;
+ (*delta) = new_unit_pos - group->position().x;
+ if (*delta == 0.0) {
+ return true;
+ }
+ } else {
+ if (new_unit_pos == group->position().x) {
+ return true;
+ }
}
+ group->set_x_position (new_unit_pos);
+
PositionChanged (frame_position, src); /* EMIT_SIGNAL */
return true;
item_duration = dur;
- reset_width_dependent_items (trackview.editor().frame_to_pixel (dur));
+ reset_width_dependent_items (trackview.editor().sample_to_pixel (dur));
DurationChanged (dur, src); /* EMIT_SIGNAL */
return true;
void
TimeAxisViewItem::set_name_text(const string& new_name)
{
- if (!name_pixbuf) {
+ if (!name_text) {
return;
}
- last_item_width = trackview.editor().frame_to_pixel(item_duration);
- name_pixbuf_width = pixel_width (new_name, NAME_FONT) + 2;
- name_pixbuf->set (pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000")));
-}
+ name_text_width = pixel_width (new_name, NAME_FONT) + 2;
+ name_text->set (new_name);
+}
/**
* Set the height of this item.
{
_height = height;
- if (name_highlight) {
- if (height < NAME_HIGHLIGHT_THRESH) {
- name_highlight->hide ();
- high_enough_for_name = false;
-
- } else {
- name_highlight->show();
- high_enough_for_name = true;
- }
-
- if (height > NAME_HIGHLIGHT_SIZE) {
- name_highlight->set_y0 ((double) height - 1 - NAME_HIGHLIGHT_SIZE);
- name_highlight->set_y1 ((double) height - 1);
- }
- else {
- /* it gets hidden now anyway */
- name_highlight->set_y0 (1);
- name_highlight->set_y1 (height);
- }
- }
+ manage_name_highlight ();
if (visibility & ShowNameText) {
- name_pixbuf->set_y_position (height + 1 - NAME_Y_OFFSET);
+ name_text->set_y_position (height - NAME_Y_OFFSET);
}
if (frame) {
- frame->set_y1 (height - 1);
+ frame->set_y1 (height);
if (frame_handle_start) {
- frame_handle_start->set_y1 (height - 1);
- frame_handle_end->set_y1 (height - 1);
+ frame_handle_start->set_y1 (height);
+ frame_handle_end->set_y1 (height);
}
}
- vestigial_frame->set_y1 (height - 1);
+ vestigial_frame->set_y1 (height - 1.0);
- update_name_pixbuf_visibility ();
set_colors ();
}
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+ if (!name_highlight) {
+ return;
+ }
+
+ if (_height < NAME_HIGHLIGHT_THRESH) {
+ high_enough_for_name = false;
+ } else {
+ high_enough_for_name = true;
+ }
+
+ if (_width < 2.0) {
+ wide_enough_for_name = false;
+ } else {
+ wide_enough_for_name = true;
+ }
+
+ if (name_highlight && wide_enough_for_name && high_enough_for_name) {
+
+ name_highlight->show();
+
+ name_highlight->set_y0 ((double) _height - NAME_HIGHLIGHT_SIZE);
+ name_highlight->set_y1 ((double) _height - 1.0);
+
+ if (visibility & FullWidthNameHighlight) {
+ /* x0 is always 0.0 */
+ name_highlight->set_x1 (_width+RIGHT_EDGE_SHIFT);
+ } else {
+ /* x0 is always 1.0 */
+ name_highlight->set_x1 (_width+RIGHT_EDGE_SHIFT);
+ }
+
+ } else {
+ name_highlight->hide();
+ }
+
+ manage_name_text ();
+}
+
void
TimeAxisViewItem::set_color (Gdk::Color const & base_color)
{
return name_highlight;
}
-ArdourCanvas::Pixbuf*
-TimeAxisViewItem::get_name_pixbuf()
-{
- return name_pixbuf;
-}
-
/**
* Calculate some contrasting color for displaying various parts of this item, based upon the base color.
*
set_frame_color();
if (name_highlight) {
- name_highlight->set_fill_color (fill_color);
+ name_highlight->set_fill_color (fill_color);
+ }
+
+ if (name_text) {
+ double r, g, b, a;
+
+ const double black_r = 0.0;
+ const double black_g = 0.0;
+ const double black_b = 0.0;
+
+ const double white_r = 1.0;
+ const double white_g = 1.0;
+ const double white_b = 1.0;
+
+ ArdourCanvas::color_to_rgba (fill_color, r, g, b, a);
+
+ /* Use W3C contrast guideline calculation */
+
+ double white_contrast = (max (r, white_r) - min (r, white_r)) +
+ (max (g, white_g) - min (g, white_g)) +
+ (max (b, white_b) - min (b, white_b));
+
+ double black_contrast = (max (r, black_r) - min (r, black_r)) +
+ (max (g, black_g) - min (g, black_g)) +
+ (max (b, black_b) - min (b, black_b));
+
+ if (white_contrast > black_contrast) {
+ /* use white */
+ name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
+ } else {
+ /* use black */
+ name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
+ }
+
+#if 0
+ double h, s, v;
+
+ ArdourCanvas::color_to_hsv (fill_color, h, s, v);
+
+ if (v == 0.0) {
+ /* fill is black, set text to white */
+ name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
+ } else if (v == 1.0) {
+ /* fill is white, set text to black */
+ name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
+ } else {
+
+ h = fabs (fmod ((h - 180), 360.0)); /* complementary color */
+ s = 1.0; /* fully saturate */
+ v = 0.9; /* increase lightness/brightness/value */
+
+ name_text->set_color (ArdourCanvas::hsv_to_color (h, s, v, 1.0));
+ }
+#endif
+
}
+
set_trim_handle_colors();
}
-/**
- * Sets the frame color depending on whether this item is selected
- */
-void
-TimeAxisViewItem::set_frame_color()
+uint32_t
+TimeAxisViewItem::get_fill_color () const
{
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);
- }
+ f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
} else {
if (_recregion) {
- f = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
+ f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
} else {
- if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
- f = ARDOUR_UI::config()->canvasvar_FrameBase.get();
+ if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+ f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
} else {
f = fill_color;
}
+ }
+ }
- if (fill_opacity) {
- f = UINT_RGBA_CHANGE_A (f, fill_opacity);
- }
+ return f;
+}
- if (!rect_visible) {
- f = UINT_RGBA_CHANGE_A (f, 0);
- }
- }
+/**
+ * Sets the frame color depending on whether this item is selected
+ */
+void
+TimeAxisViewItem::set_frame_color()
+{
+ uint32_t f = 0;
+
+ if (!frame) {
+ return;
+ }
+
+ f = get_fill_color ();
+
+ if (fill_opacity) {
+ f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+ }
+
+ if (!rect_visible) {
+ f = UINT_RGBA_CHANGE_A (f, 0);
}
frame->set_fill_color (f);
+ set_frame_gradient ();
if (!_recregion) {
if (_selected) {
- f = ARDOUR_UI::config()->canvasvar_SelectedTimeAxisFrame.get();
+ f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
} else {
- f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+ f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
}
if (!rect_visible) {
}
}
+void
+TimeAxisViewItem::set_frame_gradient ()
+{
+ if (ARDOUR_UI::config()->get_timeline_item_gradient_depth() == 0.0) {
+ frame->set_gradient (ArdourCanvas::Fill::StopList (), 0);
+ return;
+ }
+
+ ArdourCanvas::Fill::StopList stops;
+ double r, g, b, a;
+ double h, s, v;
+ ArdourCanvas::Color f (get_fill_color());
+
+ /* need to get alpha value */
+ ArdourCanvas::color_to_rgba (f, r, g, b, a);
+
+ stops.push_back (std::make_pair (0.0, f));
+
+ /* now a darker version */
+
+ ArdourCanvas::color_to_hsv (f, h, s, v);
+
+ v = min (1.0, v * (1.0 - ARDOUR_UI::config()->get_timeline_item_gradient_depth()));
+
+ ArdourCanvas::Color darker = ArdourCanvas::hsv_to_color (h, s, v, a);
+ stops.push_back (std::make_pair (1.0, darker));
+
+ frame->set_gradient (stops, true);
+}
+
/**
* Set the colors of the start and end trim handle depending on object state
*/
{
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->set_fill_color (ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get());
- frame_handle_end->set_fill_color (ARDOUR_UI::config()->canvasvar_TrimHandleLocked.get());
+ frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
+ frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
} else {
- frame_handle_start->set_fill_color (RGBA_TO_UINT (1, 1, 1, 0)); //ARDOUR_UI::config()->canvasvar_TrimHandle.get();
- frame_handle_end->set_fill_color (RGBA_TO_UINT (1, 1, 1, 0)); //ARDOUR_UI::config()->canvasvar_TrimHandle.get();
+ frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
+ frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
}
}
}
+bool
+TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item)
+{
+ switch (ev->type) {
+ case GDK_LEAVE_NOTIFY:
+ item->set_fill (false);
+ break;
+ case GDK_ENTER_NOTIFY:
+ item->set_fill (true);
+ break;
+ default:
+ break;
+ }
+ return false;
+}
+
/** @return the frames per pixel */
double
-TimeAxisViewItem::get_frames_per_pixel () const
+TimeAxisViewItem::get_samples_per_pixel () const
{
- return frames_per_pixel;
+ return samples_per_pixel;
}
/** Set the frames per pixel of this item.
* @param fpp the new frames per pixel
*/
void
-TimeAxisViewItem::set_frames_per_pixel (double fpp)
+TimeAxisViewItem::set_samples_per_pixel (double fpp)
{
- frames_per_pixel = fpp;
+ samples_per_pixel = fpp;
set_position (this->get_position(), this);
- reset_width_dependent_items ((double) get_duration() / frames_per_pixel);
+ reset_width_dependent_items ((double) get_duration() / samples_per_pixel);
}
void
TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
{
+ _width = pixel_width;
+
+ manage_name_highlight ();
if (pixel_width < 2.0) {
vestigial_frame->show();
}
- if (name_highlight) {
- name_highlight->hide();
- }
-
if (frame) {
frame->hide();
}
frame_handle_end->hide();
}
- wide_enough_for_name = false;
-
} else {
vestigial_frame->hide();
- if (name_highlight) {
-
- if (_height < NAME_HIGHLIGHT_THRESH) {
- name_highlight->hide();
- high_enough_for_name = false;
- } else {
- name_highlight->show();
- if (!get_item_name().empty()) {
- reset_name_width (pixel_width);
- }
- high_enough_for_name = true;
- }
-
- name_highlight->set_x1 (pixel_width);
- }
-
if (frame) {
frame->show();
- frame->set_x1 (pixel_width);
+ frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
}
if (frame_handle_start) {
* the right-hand end of frame_handle_start and the left-hand
* end of frame_handle_end, so disable the handles
*/
+
frame_handle_start->hide();
frame_handle_end->hide();
} else {
frame_handle_start->show();
- frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
- frame_handle_end->set_x1 (pixel_width);
+ frame_handle_end->set_x0 (pixel_width + RIGHT_EDGE_SHIFT - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
+ frame_handle_end->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
frame_handle_end->show();
}
}
-
- wide_enough_for_name = true;
}
-
- update_name_pixbuf_visibility ();
}
void
-TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
+TimeAxisViewItem::manage_name_text ()
{
- uint32_t it_width;
- int pb_width;
- bool pixbuf_holds_full_name;
+ int visible_name_width;
- if (!name_pixbuf) {
+ if (!name_text) {
return;
}
- it_width = trackview.editor().frame_to_pixel(item_duration);
- pb_width = name_pixbuf_width;
-
- pixbuf_holds_full_name = last_item_width > pb_width + NAME_X_OFFSET;
- last_item_width = it_width;
-
- 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.
- */
+ if (!wide_enough_for_name || !high_enough_for_name) {
+ name_text->hide ();
return;
}
-
- if (pb_width > it_width - NAME_X_OFFSET) {
- pb_width = it_width - NAME_X_OFFSET;
- }
-
- if (it_width <= NAME_X_OFFSET) {
- wide_enough_for_name = false;
- } else {
- wide_enough_for_name = true;
+
+ if (name_text->text().empty()) {
+ name_text->hide ();
}
- update_name_pixbuf_visibility ();
+ visible_name_width = name_text_width;
- if (pb_width < 1) {
- pb_width = 1;
+ if (visible_name_width > _width - NAME_X_OFFSET) {
+ visible_name_width = _width - NAME_X_OFFSET;
}
- name_pixbuf->set (pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000")));
+ if (visible_name_width < 1) {
+ name_text->hide ();
+ } else {
+ name_text->clamp_width (visible_name_width);
+ name_text->show ();
+ }
}
/**
group->set_y_position (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 ();
+ set_colors ();
+ } else if (p == "timeline-item-gradient-depth") {
+ set_frame_gradient ();
}
}