/*
- 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
*/
-#include <pbd/error.h>
+#include "pbd/error.h"
+#include "pbd/stacktrace.h"
-#include <ardour/types.h>
-#include <ardour/ardour.h>
+#include "ardour/types.h"
+#include "ardour/ardour.h"
#include <gtkmm2ext/utils.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"
#include "time_axis_view.h"
using namespace Editing;
using namespace Glib;
using namespace PBD;
+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 ;
+int TimeAxisViewItem::NAME_HEIGHT;
double TimeAxisViewItem::NAME_Y_OFFSET;
double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE;
double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH;
-
//---------------------------------------------------------------------------------------//
// Constructor / Desctructor
* @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,
+ nframes64_t start, nframes64_t duration, bool recording,
Visibility vis)
- : trackview (tv)
+ : trackview (tv), _recregion(recording)
{
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<Pango::Layout> layout = foo.create_pango_layout (X_("Hg")); /* ascender + descender */
- int width;
- int height;
+ int width = 0;
+ int height = 0;
- 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_HIGHLIGHT_SIZE = height + 6;
- NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2;
+ NAME_HEIGHT = height;
+ NAME_Y_OFFSET = height + 3;
+ NAME_HIGHLIGHT_SIZE = height + 2;
+ NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
have_name_font = true;
}
group = new ArdourCanvas::Group (parent);
-
+
init (it_name, spu, base_color, start, duration, vis);
}
TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
- : trackview (other.trackview)
+ : sigc::trackable(other)
+ , trackview (other.trackview)
{
Gdk::Color c;
/* 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);
}
-
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, nframes64_t start, nframes64_t duration, Visibility vis)
{
item_name = it_name ;
samples_per_unit = spu ;
frame_position = start ;
item_duration = duration ;
name_connected = false;
- fill_opacity = 130;
+ fill_opacity = 60;
position_locked = false ;
max_item_duration = ARDOUR::max_frames;
min_item_duration = 0 ;
show_vestigial = true;
visibility = vis;
+ _sensitive = true;
+ name_pixbuf_width = 0;
+ last_item_width = 0;
if (duration == 0) {
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->property_outline_color_rgba() = color_map[cVestigialFrameOutline];
- vestigial_frame->property_fill_color_rgba() = color_map[cVestigialFrameFill];
+ 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();
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->property_outline_color_rgba() = color_map[cTimeAxisFrameOutline];
- frame->property_fill_color_rgba() = color_map[cTimeAxisFrameFill];
+ 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 */
}
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() - 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() = color_map[cNameHighlightFill];
- name_highlight->property_fill_color_rgba() = color_map[cNameHighlightOutline];
-
name_highlight->set_data ("timeaxisviewitem", this);
} else {
}
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_pixbuf = new ArdourCanvas::Pixbuf(*group);
+ name_pixbuf->property_x() = NAME_X_OFFSET;
+ name_pixbuf->property_y() = trackview.current_height() - 1.0 - 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 */
+ 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;
- 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() = color_map[cFrameHandleStartOutline];
- frame_handle_start->property_fill_color_rgba() = color_map[cFrameHandleStartFill];
-
- 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() = color_map[cFrameHandleEndOutline];
- frame_handle_end->property_fill_color_rgba() = color_map[cFrameHandleEndFill];
-
- } else {
- frame_handle_start = 0;
- frame_handle_end = 0;
- }
+ 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;
set_color (base_color) ;
* @return true if the position change was a success, false otherwise
*/
bool
-TimeAxisViewItem::set_position(nframes_t pos, void* src, double* delta)
+TimeAxisViewItem::set_position(nframes64_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
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 ;
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 */
return true;
*
* @return the position of this item
*/
-nframes_t
+nframes64_t
TimeAxisViewItem::get_position() const
{
return frame_position;
* @return true if the duration change was succesful, false otherwise
*/
bool
-TimeAxisViewItem::set_duration (nframes_t dur, void* src)
+TimeAxisViewItem::set_duration (nframes64_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)
}
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;
}
* Returns the duration of this item
*
*/
-nframes_t
+nframes64_t
TimeAxisViewItem::get_duration() const
{
return (item_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(nframes64_t dur, void* src)
{
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
+nframes64_t
TimeAxisViewItem::get_max_duration() const
{
return (max_item_duration) ;
* @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(nframes64_t dur, void* src)
{
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
+nframes64_t
TimeAxisViewItem::get_min_duration() const
{
return(min_item_duration) ;
* @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(max_duration_active) ;
}
-
+
/**
* Sets whether the Minimum Duration constraint is active and should be enforced
*
* @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 ;
}
-
+
/**
* Returns whether the Maximum Duration constraint is active and should be enforced
*
}
}
-void
+void
TimeAxisViewItem::set_should_show_selection (bool yn)
{
if (should_show_selection != yn) {
TimeAxisViewItem::get_time_axis_view()
{
return trackview;
-}
+}
//---------------------------------------------------------------------------------------//
// ui methods & data
* @param new_name the new name text to display
*/
void
-TimeAxisViewItem::set_name_text(std::string new_name)
+TimeAxisViewItem::set_name_text(const ustring& new_name)
{
- if (name_text) {
- name_text->property_text() = new_name.c_str();
+ 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_ustring(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
+
/**
* Set the height of this item
*
* @param h the new height
- */
+ */
void
-TimeAxisViewItem::set_height(double height)
+TimeAxisViewItem::set_height (double height)
{
if (name_highlight) {
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 (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 - 2;
}
else {
/* it gets hidden now anyway */
}
}
- 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;
+ 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;
}
/**
- *
+ *
*/
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()
}
/**
- *
+ *
*/
-ArdourCanvas::Item*
+ArdourCanvas::Group*
TimeAxisViewItem::get_canvas_group()
{
return (group) ;
}
/**
- *
+ *
*/
ArdourCanvas::Item*
TimeAxisViewItem::get_name_highlight()
}
/**
- *
+ *
*/
-ArdourCanvas::Text*
-TimeAxisViewItem::get_name_text()
+ArdourCanvas::Pixbuf*
+TimeAxisViewItem::get_name_pixbuf()
{
- return (name_text) ;
+ return (name_pixbuf) ;
}
/**
* @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 ;
/* 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,255) ;
+ 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.
*/
r = base_color.get_red()/256;
g = base_color.get_green()/256;
b = base_color.get_blue()/256;
-
+
if (r > b)
{
if (r > g)
{
/* green sector => blue */
swap (g,b);
- }
+ }
}
else
{
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 ;
-
+
label_color = RGBA_TO_UINT(r,g,b,255);
/* XXX can we do better than this ? */
/* 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 ;
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;
{
if (frame) {
uint32_t r,g,b,a;
-
+
if (_selected && should_show_selection) {
- UINT_TO_RGBA(color_map[cSelectedFrameBase], &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
+ 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(color_map[cFrameBase], &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
+ 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);
+ }
}
}
}
{
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleLockedStart];
- frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleLockedEnd];
+ 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();
} else {
- frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleStart];
- frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleEnd];
+ 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();
}
}
}
if (name_highlight) {
name_highlight->hide();
- if (name_text) {
- name_text->hide();
- }
+ name_pixbuf->hide();
}
if (frame) {
frame_handle_start->hide();
frame_handle_end->hide();
}
-
+
} else {
vestigial_frame->hide();
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);
}
}
}
void
-TimeAxisViewItem::reset_name_width (double pixel_width)
+TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
{
- if (name_text == 0) {
+ uint32_t it_width;
+ int pb_width;
+ bool pixbuf_holds_full_name;
+
+ if (!name_pixbuf) {
return;
}
-
- int width;
-
- ustring ustr = fit_to_pixels (item_name, (int) floor (pixel_width - NAME_X_OFFSET), NAME_FONT, width);
- if (ustr.empty()) {
-
- name_text->hide ();
-
- } else {
-
- /* don't use name for event handling if it leaves no room
- for trimming to work.
+ 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 (pixel_width - 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->show();
+ return;
+ }
+
+ if (pb_width > it_width - NAME_X_OFFSET) {
+ pb_width = it_width - NAME_X_OFFSET;
}
+
+ if (pb_width <= 0 || it_width <= NAME_X_OFFSET) {
+ name_pixbuf->hide();
+ return;
+ } else {
+ name_pixbuf->show();
+ }
+
+ name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
item = 0;
return false;
}
+
+void
+TimeAxisViewItem::set_y (double y)
+{
+ double const old = group->property_y ();
+ if (y != old) {
+ group->move (0, y - old);
+ }
+}
+
+
+
projects / ardour.git / blobdiff