#include <ardour/types.h>
#include <ardour/ardour.h>
+#include <gtkmm2ext/utils.h>
+
#include "public_editor.h"
#include "time_axis_view_item.h"
#include "time_axis_view.h"
-#include "canvas-simplerect.h"
-#include "canvas-imageframe.h"
+#include "simplerect.h"
#include "utils.h"
+#include "canvas_impl.h"
#include "rgb_macros.h"
#include "i18n.h"
using namespace std;
using namespace Editing;
+using namespace Glib;
+using namespace PBD;
//------------------------------------------------------------------------------
-/** Initialize static memeber data */
+/** Initialize const static memeber data */
+
Pango::FontDescription TimeAxisViewItem::NAME_FONT;
bool TimeAxisViewItem::have_name_font = false;
const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
-const double TimeAxisViewItem::NAME_Y_OFFSET = 15.0 ; /* XXX depends a lot on the font size, sigh. */
-const double TimeAxisViewItem::NAME_HIGHLIGHT_SIZE = 15.0 ; /* ditto */
-const double TimeAxisViewItem::NAME_HIGHLIGHT_THRESH = 32.0 ; /* ditto */
const double TimeAxisViewItem::GRAB_HANDLE_LENGTH = 6 ;
+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(std::string it_name, GnomeCanvasGroup* parent, TimeAxisView& tv, double spu, Gdk::Color& base_color,
+TimeAxisViewItem::TimeAxisViewItem(const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color& base_color,
jack_nframes_t start, jack_nframes_t duration,
- Visibility visibility)
+ Visibility vis)
: trackview (tv)
{
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;
+
+ layout->set_font_description (NAME_FONT);
+ Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+
+ NAME_Y_OFFSET = height + 4;
+ NAME_HIGHLIGHT_SIZE = height + 6;
+ NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 2;
+
have_name_font = true;
}
max_item_duration = ARDOUR::max_frames;
min_item_duration = 0 ;
show_vestigial = true;
+ visibility = vis;
if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl ;
}
- group = gnome_canvas_item_new(GNOME_CANVAS_GROUP(parent),gnome_canvas_group_get_type(),NULL) ;
+ group = new ArdourCanvas::Group (parent);
- vestigial_frame = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_simplerect_get_type(),
- "x1", (double) 0.0,
- "y1", (double) 1.0,
- "x2", 2.0,
- "y2", (double) trackview.height,
- "outline_color_rgba", color_map[cVestigialFrameOutline],
- "fill_color_rgba", color_map[cVestigialFrameFill],
- NULL);
- gnome_canvas_item_hide (vestigial_frame);
+ 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->hide ();
if (visibility & ShowFrame) {
- frame = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_simplerect_get_type(),
- "x1", (double) 0.0,
- "y1", (double) 1.0,
- "x2", (double) trackview.editor.frame_to_pixel(duration),
- "y2", (double) trackview.height,
- "outline_color_rgba", color_map[cTimeAxisFrameOutline],
- "fill_color_rgba", color_map[cTimeAxisFrameFill],
- NULL);
+ 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];
+
+ /* 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 (visibility & HideFrameTB) {
+ outline_what &= ~(0x4 | 0x8);
+ }
+
+ frame->property_outline_what() = outline_what;
+
} else {
frame = 0;
}
if (visibility & ShowNameHighlight) {
- name_highlight = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_simplerect_get_type(),
- "x1", (double) 1.0,
- "x2", (double) (trackview.editor.frame_to_pixel(item_duration)) - 1,
- "y1", (double) (trackview.height - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE),
- "y2", (double) (trackview.height - 1),
- "outline_color_rgba", color_map[cNameHighlightFill],
- "fill_color_rgba", color_map[cNameHighlightOutline],
- NULL) ;
- gtk_object_set_data(GTK_OBJECT(name_highlight), "timeaxisviewitem", this) ;
+ 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));
+ } else {
+ name_highlight->property_x1() = (double) 1.0;
+ name_highlight->property_x2() = (double) (trackview.editor.frame_to_pixel(item_duration)) - 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 {
name_highlight = 0;
}
if (visibility & ShowNameText) {
- name_text = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_text_get_type(),
- "x", (double) TimeAxisViewItem::NAME_X_OFFSET,
- "y", (double) trackview.height + 1.0 - TimeAxisViewItem::NAME_Y_OFFSET,
- "font", NAME_FONT.c_str(),
- "anchor", GTK_ANCHOR_NW,
- NULL) ;
- gtk_object_set_data(GTK_OBJECT(name_text), "timeaxisviewitem", this) ;
+ 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);
} else {
name_text = 0;
/* create our grab handles used for trimming/duration etc */
if (visibility & ShowHandles) {
- frame_handle_start = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_simplerect_get_type(),
- "x1", (double) 0.0,
- "x2", (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH,
- "y1", (double) 1.0,
- "y2", (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH+1,
- "outline_color_rgba", color_map[cFrameHandleStartOutline],
- "fill_color_rgba", color_map[cFrameHandleStartFill],
- NULL) ;
+ 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 = gnome_canvas_item_new(GNOME_CANVAS_GROUP(group),
- gnome_canvas_simplerect_get_type(),
- "x1", (double) (trackview.editor.frame_to_pixel(get_duration())) - (TimeAxisViewItem::GRAB_HANDLE_LENGTH),
- "x2", (double) trackview.editor.frame_to_pixel(get_duration()),
- "y1", (double) 1,
- "y2", (double) TimeAxisViewItem::GRAB_HANDLE_LENGTH + 1,
- "outline_color_rgba", color_map[cFrameHandleEndOutline],
- "fill_color_rgba", color_map[cFrameHandleEndFill],
- NULL) ;
+ 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;
*/
TimeAxisViewItem::~TimeAxisViewItem()
{
- gtk_object_destroy (GTK_OBJECT(group));
+ delete group;
}
version of GNOME Canvas rectifies this issue cleanly.
*/
- GtkArg args[1] ;
double old_unit_pos ;
double new_unit_pos = pos / samples_per_unit ;
- args[0].name = "x" ;
- gtk_object_getv (GTK_OBJECT(group), 1, args) ;
- old_unit_pos = GTK_VALUE_DOUBLE (args[0]) ;
+ old_unit_pos = group->property_x();
if (new_unit_pos != old_unit_pos) {
- gnome_canvas_item_move (group, new_unit_pos - old_unit_pos, 0.0) ;
+ 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;
}
}
if (dur == 0) {
- gnome_canvas_item_hide (group);
+ group->hide();
}
item_duration = dur;
reset_width_dependent_items (pixel_width);
- DurationChanged (dur, src) ; /* EMIT_SIGNAL */
+ DurationChanged (dur, src) ; /* EMIT_SIGNAL */
return true;
}
TimeAxisViewItem::set_max_duration(jack_nframes_t dur, void* src)
{
max_item_duration = dur ;
- MaxDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
+ MaxDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
}
/**
jack_nframes_t
TimeAxisViewItem::get_max_duration() const
{
- return(max_item_duration) ;
+ return (max_item_duration) ;
}
/**
TimeAxisViewItem::set_min_duration(jack_nframes_t dur, void* src)
{
min_item_duration = dur ;
- MinDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
+ MinDurationChanged(max_item_duration, src) ; /* EMIT_SIGNAL */
}
/**
* @param src the identity of the object that initiated the change
*/
void
-TimeAxisViewItem::set_selected(bool yn, void* src)
+TimeAxisViewItem::set_selected(bool yn)
{
if (_selected != yn) {
- _selected = yn ;
+ Selectable::set_selected (yn);
set_frame_color ();
- Selected (_selected) ; /* EMIT_SIGNAL */
}
}
-/**
- * Returns whether this item is currently selected.
- *
- * @return true if this item is currently selected, false otherwise
- */
-bool
-TimeAxisViewItem::get_selected() const
-{
- return (_selected) ;
-}
-
void
TimeAxisViewItem::set_should_show_selection (bool yn)
{
TimeAxisViewItem::set_name_text(std::string new_name)
{
if (name_text) {
- gnome_canvas_item_set (name_text, "text", new_name.c_str(), NULL);
+ name_text->property_text() = new_name.c_str();
}
}
{
if (name_highlight) {
if (height < NAME_HIGHLIGHT_THRESH) {
- gnome_canvas_item_hide (name_highlight);
- gnome_canvas_item_hide (name_text);
+ name_highlight->hide();
+ if (name_text) {
+ name_text->hide();
+ }
} else {
- gnome_canvas_item_show (name_highlight);
- gnome_canvas_item_show (name_text);
+ name_highlight->show();
+ if (name_text) {
+ name_text->show();
+ }
}
if (height > NAME_HIGHLIGHT_SIZE) {
- gnome_canvas_item_set (name_highlight,
- "y1", (double) height+1 - NAME_HIGHLIGHT_SIZE,
- "y2", (double) height,
- NULL);
+ name_highlight->property_y1() = (double) height+1 - NAME_HIGHLIGHT_SIZE;
+ name_highlight->property_y2() = (double) height;
}
else {
/* it gets hidden now anyway */
- gnome_canvas_item_set (name_highlight,
- "y1", (double) 1.0,
- "y2", (double) height,
- NULL);
+ name_highlight->property_y1() = (double) 1.0;
+ name_highlight->property_y2() = (double) height;
}
}
if (name_text) {
- gnome_canvas_item_set (name_text, "y", height+1 - NAME_Y_OFFSET, NULL);
+ name_text->property_y() = height+1 - NAME_Y_OFFSET;
if (height < NAME_HIGHLIGHT_THRESH) {
- gnome_canvas_item_set(name_text, "fill_color_rgba", fill_color, NULL) ;
+ name_text->property_fill_color_rgba() = fill_color;
}
else {
- gnome_canvas_item_set(name_text, "fill_color_rgba", label_color, NULL) ;
+ name_text->property_fill_color_rgba() = label_color;
}
}
if (frame) {
- gnome_canvas_item_set (frame, "y2", height+1, NULL) ;
+ frame->property_y2() = height+1;
}
- gnome_canvas_item_set (vestigial_frame, "y2", height+1, NULL) ;
+ vestigial_frame->property_y2() = height+1;
}
/**
/**
*
*/
-GnomeCanvasItem*
+ArdourCanvas::Item*
TimeAxisViewItem::get_canvas_frame()
{
return(frame) ;
/**
*
*/
-GnomeCanvasItem*
+ArdourCanvas::Item*
TimeAxisViewItem::get_canvas_group()
{
- return(group) ;
+ return (group) ;
}
/**
*
*/
-GnomeCanvasItem*
+ArdourCanvas::Item*
TimeAxisViewItem::get_name_highlight()
{
- return(name_highlight) ;
+ return (name_highlight) ;
}
/**
*
*/
-GnomeCanvasItem*
+ArdourCanvas::Text*
TimeAxisViewItem::get_name_text()
{
- return(name_text) ;
+ return (name_text) ;
}
/**
* @param color the base color of the item
*/
void
-TimeAxisViewItem::compute_colors(GdkColor& base_color)
+TimeAxisViewItem::compute_colors(Gdk::Color& base_color)
{
unsigned char radius ;
char minor_shift ;
unsigned char r,g,b ;
/* FILL: this is simple */
- r = base_color.red/256 ;
- g = base_color.green/256 ;
- b = base_color.blue/256 ;
+ 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) ;
/* for minor colors:
/* LABEL: rotate around color wheel by 120 degrees anti-clockwise */
- r = base_color.red/256;
- g = base_color.green/256;
- b = base_color.blue/256;
+ r = base_color.get_red()/256;
+ g = base_color.get_green()/256;
+ b = base_color.get_blue()/256;
if (r > b)
{
g += minor_shift;
label_color = RGBA_TO_UINT(r,g,b,255);
- r = (base_color.red/256) + 127 ;
- g = (base_color.green/256) + 127 ;
- b = (base_color.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);
double height = NAME_HIGHLIGHT_THRESH;
if (frame) {
- GtkArg args[1] ;
- args[0].name = "y2" ;
- gtk_object_getv (GTK_OBJECT(frame), 1, args);
- height = GTK_VALUE_DOUBLE (args[0]);
+ height = frame->property_y2();
}
if (height < NAME_HIGHLIGHT_THRESH) {
- gnome_canvas_item_set(name_text, "fill_color_rgba", fill_color, NULL) ;
+ name_text->property_fill_color_rgba() = fill_color;
}
else {
- gnome_canvas_item_set(name_text, "fill_color_rgba", label_color, NULL) ;
+ name_text->property_fill_color_rgba() = label_color;
}
}
if (name_highlight) {
- gnome_canvas_item_set(name_highlight, "fill_color_rgba", fill_color, NULL) ;
- gnome_canvas_item_set(name_highlight, "outline_color_rgba", fill_color, NULL) ;
+ name_highlight->property_fill_color_rgba() = fill_color;
+ name_highlight->property_outline_color_rgba() = fill_color;
}
set_trim_handle_colors() ;
}
if (_selected && should_show_selection) {
UINT_TO_RGBA(color_map[cSelectedFrameBase], &r, &g, &b, &a);
- gnome_canvas_item_set(frame, "fill_color_rgba", RGBA_TO_UINT(r, g, b, fill_opacity), NULL) ;
+ frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
} else {
UINT_TO_RGBA(color_map[cFrameBase], &r, &g, &b, &a);
- gnome_canvas_item_set(frame, "fill_color_rgba", RGBA_TO_UINT(r, g, b, fill_opacity), NULL) ;
+ frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity);
}
}
}
{
if (frame_handle_start) {
if (position_locked) {
- gnome_canvas_item_set(frame_handle_start, "fill_color_rgba", color_map[cTrimHandleLockedStart], NULL);
- gnome_canvas_item_set(frame_handle_end, "fill_color_rgba", color_map[cTrimHandleLockedEnd], NULL) ;
+ frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleLockedStart];
+ frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleLockedEnd];
} else {
- gnome_canvas_item_set(frame_handle_start, "fill_color_rgba", color_map[cTrimHandleStart], NULL) ;
- gnome_canvas_item_set(frame_handle_end, "fill_color_rgba", color_map[cTrimHandleEnd], NULL) ;
+ frame_handle_start->property_fill_color_rgba() = color_map[cTrimHandleStart];
+ frame_handle_end->property_fill_color_rgba() = color_map[cTrimHandleEnd];
}
}
}
if (pixel_width < GRAB_HANDLE_LENGTH * 2) {
if (frame_handle_start) {
- gnome_canvas_item_hide (frame_handle_start);
- gnome_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
} if (pixel_width < 2.0) {
if (show_vestigial) {
- gnome_canvas_item_show (vestigial_frame);
+ vestigial_frame->show();
}
if (name_highlight) {
- gnome_canvas_item_hide (name_highlight);
- gnome_canvas_item_hide (name_text);
+ name_highlight->hide();
+ if (name_text) {
+ name_text->hide();
+ }
}
if (frame) {
- gnome_canvas_item_hide (frame);
+ frame->hide();
}
if (frame_handle_start) {
- gnome_canvas_item_hide (frame_handle_start);
- gnome_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
} else {
- gnome_canvas_item_hide (vestigial_frame);
+ vestigial_frame->hide();
if (name_highlight) {
- GtkArg args[1] ;
- args[0].name = "y2" ;
- gtk_object_getv (GTK_OBJECT(name_highlight), 1, args);
- double height = GTK_VALUE_DOUBLE (args[0]);
+ double height = name_highlight->property_y2 ();
if (height < NAME_HIGHLIGHT_THRESH) {
- gnome_canvas_item_hide (name_highlight);
- gnome_canvas_item_hide (name_text);
+ name_highlight->hide();
+ if (name_text) {
+ name_text->hide();
+ }
+ } else {
+ name_highlight->show();
+ if (name_text) {
+ name_text->show();
+ reset_name_width (pixel_width);
+ }
+ }
+
+ if (visibility & FullWidthNameHighlight) {
+ name_highlight->property_x2() = pixel_width;
} else {
- gnome_canvas_item_show (name_highlight);
- gnome_canvas_item_show (name_text);
- reset_name_width (pixel_width);
+ name_highlight->property_x2() = pixel_width - 1.0;
}
- gnome_canvas_item_set (name_highlight, "x2", pixel_width - 1.0, NULL);
}
if (frame) {
- gnome_canvas_item_show (frame);
- gnome_canvas_item_set (frame, "x2", pixel_width, NULL);
+ frame->show();
+ frame->property_x2() = pixel_width;
}
if (frame_handle_start) {
if (pixel_width < (2*TimeAxisViewItem::GRAB_HANDLE_LENGTH)) {
- gnome_canvas_item_hide (frame_handle_start);
- gnome_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
- gnome_canvas_item_show (frame_handle_start);
- gnome_canvas_item_set(GNOME_CANVAS_ITEM(frame_handle_end), "x1", pixel_width - (TimeAxisViewItem::GRAB_HANDLE_LENGTH ), NULL) ;
- gnome_canvas_item_show (frame_handle_end);
- gnome_canvas_item_set(GNOME_CANVAS_ITEM(frame_handle_end), "x2", pixel_width, NULL) ;
+ frame_handle_start->show();
+ frame_handle_end->property_x1() = pixel_width - (TimeAxisViewItem::GRAB_HANDLE_LENGTH);
+ frame_handle_end->show();
+ frame_handle_end->property_x2() = pixel_width;
}
}
}
void
TimeAxisViewItem::reset_name_width (double pixel_width)
{
- gint width;
- gint lbearing;
- gint rbearing;
- gint ascent;
- gint descent;
- Gdk_Font font (NAME_FONT);
-
if (name_text == 0) {
return;
}
-
- int namelen = item_name.length();
- char cstr[namelen+1];
- strcpy (cstr, item_name.c_str());
+
+ int width;
- while (namelen) {
-
- gdk_string_extents (font,
- cstr,
- &lbearing,
- &rbearing,
- &width,
- &ascent,
- &descent);
-
- if (width < (pixel_width - NAME_X_OFFSET)) {
- break;
- }
-
- --namelen;
- cstr[namelen] = '\0';
-
- }
+ ustring ustr = fit_to_pixels (item_name, (int) floor (pixel_width - NAME_X_OFFSET), NAME_FONT, width);
- if (namelen == 0) {
+ if (ustr.empty()) {
- gnome_canvas_item_hide (name_text);
+ name_text->hide ();
} else {
}
}
- gnome_canvas_item_set (name_text, "text", cstr, NULL);
- gnome_canvas_item_show (name_text);
+ name_text->property_text() = ustr;
+ name_text->show();
}
}
* This is used to avoid deleting the obejct while inside the remove_this_item
* method
*
- * @param item the ImageFrameTimeAxisGroup to remove
+ * @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 */
- delete item ;
- item = 0 ;
- return(false) ;
+ item->ItemRemoved (item->get_item_name(), src) ; /* EMIT_SIGNAL */
+ delete item;
+ item = 0;
+ return false;
}
projects / ardour.git / blobdiff