/*
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
-#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"
-#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;
+using namespace ARDOUR;
//------------------------------------------------------------------------------
-/** Initialize static memeber data */
-std::string TimeAxisViewItem::NAME_FONT;
+/** Initialize const static memeber data */
+
+Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
+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 ;
+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(std::string it_name, GtkCanvasGroup* parent, TimeAxisView& tv, double spu, GdkColor& base_color,
- jack_nframes_t start, jack_nframes_t duration,
- Visibility visibility)
- : trackview (tv)
+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), _recregion(recording)
{
- if (NAME_FONT.empty()) {
+ 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 = 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;
+
+ have_name_font = true;
}
+ group = new ArdourCanvas::Group (parent);
+
+ init (it_name, spu, base_color, start, duration, vis);
+
+}
+
+TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
+ : sigc::trackable(other)
+ , trackview (other.trackview)
+{
+
+ Gdk::Color c;
+ int r,g,b,a;
+
+ UINT_TO_RGBA (other.fill_color, &r, &g, &b, &a);
+ c.set_rgb_p (r/255.0, g/255.0, b/255.0);
+
+ /* 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 const & base_color, nframes64_t start, nframes64_t duration, Visibility vis)
+{
item_name = it_name ;
samples_per_unit = spu ;
should_show_selection = true;
frame_position = start ;
item_duration = duration ;
name_connected = false;
- fill_opacity = 50;
+ 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 ;
}
- group = gtk_canvas_item_new(GTK_CANVAS_GROUP(parent),gtk_canvas_group_get_type(),NULL) ;
-
- vestigial_frame = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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);
- gtk_canvas_item_hide (vestigial_frame);
+ 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 = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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, 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 (visibility & HideFrameTB) {
+ outline_what &= ~(0x4 | 0x8);
+ }
+
+ frame->property_outline_what() = outline_what;
+
} else {
frame = 0;
}
if (visibility & ShowNameHighlight) {
- name_highlight = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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) ;
+ if (visibility & FullWidthNameHighlight) {
+ 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 = 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->set_data ("timeaxisviewitem", this);
+
} else {
name_highlight = 0;
}
if (visibility & ShowNameText) {
- name_text = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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_pixbuf = new ArdourCanvas::Pixbuf(*group);
+ name_pixbuf->property_x() = NAME_X_OFFSET;
+ name_pixbuf->property_y() = trackview.current_height() - 1.0 - NAME_Y_OFFSET;
+
} else {
- name_text = 0;
+ name_pixbuf = 0;
}
/* create our grab handles used for trimming/duration etc */
+ 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 = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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_end = gtk_canvas_item_new(GTK_CANVAS_GROUP(group),
- gtk_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) ;
- } 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) ;
set_position (start, this) ;
}
-
/**
* Destructor
*/
TimeAxisViewItem::~TimeAxisViewItem()
{
- gtk_object_destroy (GTK_OBJECT(group));
+ delete group;
}
* @return true if the position change was a success, false otherwise
*/
bool
-TimeAxisViewItem::set_position(jack_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 GtkCanvas version I am using
- doesn't correctly implement gtk_canvas_group_set_arg(),
+
+ /* 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 gtk_canvas_item_move(), which does the right
+ 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.
*/
-
- 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) {
- gtk_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;
}
*
* @return the position of this item
*/
-jack_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 (jack_nframes_t dur, void* src)
+TimeAxisViewItem::set_duration (nframes64_t dur, void* src)
{
if ((dur > max_item_duration) || (dur < min_item_duration)) {
- warning << compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
+ warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
<< endmsg;
return false;
}
if (dur == 0) {
- gtk_canvas_item_hide (group);
+ group->hide();
}
item_duration = dur;
-
- double pixel_width = trackview.editor.frame_to_pixel (dur);
- reset_width_dependent_items (pixel_width);
-
- DurationChanged (dur, src) ; /* EMIT_SIGNAL */
+ reset_width_dependent_items (trackview.editor().frame_to_pixel (dur));
+
+ DurationChanged (dur, src) ; /* EMIT_SIGNAL */
return true;
}
* Returns the duration of this item
*
*/
-jack_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(jack_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 */
+ 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
*/
-jack_nframes_t
+nframes64_t
TimeAxisViewItem::get_max_duration() const
{
- return(max_item_duration) ;
+ return (max_item_duration) ;
}
/**
* @param src the identity of the object that initiated the change
*/
void
-TimeAxisViewItem::set_min_duration(jack_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 */
+ 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
*/
-jack_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
*
* @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
+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) {
- gtk_canvas_item_set (name_text, "text", new_name.c_str(), NULL);
+ 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);
}
+
/**
* 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) {
- gtk_canvas_item_hide (name_highlight);
- gtk_canvas_item_hide (name_text);
+ name_highlight->hide();
+ name_pixbuf->hide();
+
} else {
- gtk_canvas_item_show (name_highlight);
- gtk_canvas_item_show (name_text);
+ name_highlight->show();
+ name_pixbuf->show();
+
}
if (height > NAME_HIGHLIGHT_SIZE) {
- gtk_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 - 2;
}
else {
/* it gets hidden now anyway */
- gtk_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) {
- gtk_canvas_item_set (name_text, "y", height+1 - NAME_Y_OFFSET, NULL);
- if (height < NAME_HIGHLIGHT_THRESH) {
- gtk_canvas_item_set(name_text, "fill_color_rgba", fill_color, NULL) ;
- }
- else {
- gtk_canvas_item_set(name_text, "fill_color_rgba", label_color, NULL) ;
- }
+ if (visibility & ShowNameText) {
+ name_pixbuf->property_y() = height - 1 - NAME_Y_OFFSET;
}
if (frame) {
- gtk_canvas_item_set (frame, "y2", height+1, NULL) ;
+ frame->property_y2() = height - 1;
+ frame_handle_start->property_y2() = height - 1;
+ frame_handle_end->property_y2() = height - 1;
}
- gtk_canvas_item_set (vestigial_frame, "y2", height+1, NULL) ;
+ vestigial_frame->property_y2() = height - 1;
}
/**
- *
+ *
*/
void
-TimeAxisViewItem::set_color(GdkColor& base_color)
+TimeAxisViewItem::set_color (Gdk::Color const & base_color)
{
compute_colors (base_color);
set_colors ();
}
/**
- *
+ *
*/
-GtkCanvasItem*
+ArdourCanvas::Item*
TimeAxisViewItem::get_canvas_frame()
{
return(frame) ;
}
/**
- *
+ *
*/
-GtkCanvasItem*
+ArdourCanvas::Group*
TimeAxisViewItem::get_canvas_group()
{
- return(group) ;
+ return (group) ;
}
/**
- *
+ *
*/
-GtkCanvasItem*
+ArdourCanvas::Item*
TimeAxisViewItem::get_name_highlight()
{
- return(name_highlight) ;
+ return (name_highlight) ;
}
/**
- *
+ *
*/
-GtkCanvasItem*
-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(GdkColor& 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.red/256 ;
- g = base_color.green/256 ;
- b = base_color.blue/256 ;
- fill_color = RGBA_TO_UINT(r,g,b,255) ;
+ 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.
*/
/* 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)
{
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.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);
/* 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) {
- GtkArg args[1] ;
- args[0].name = "y2" ;
- gtk_object_getv (GTK_OBJECT(frame), 1, args);
- height = GTK_VALUE_DOUBLE (args[0]);
- }
-
- if (height < NAME_HIGHLIGHT_THRESH) {
- gtk_canvas_item_set(name_text, "fill_color_rgba", fill_color, NULL) ;
- }
- else {
- gtk_canvas_item_set(name_text, "fill_color_rgba", label_color, NULL) ;
- }
- }
if (name_highlight) {
- gtk_canvas_item_set(name_highlight, "fill_color_rgba", fill_color, NULL) ;
- gtk_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 (frame) {
uint32_t r,g,b,a;
-
+
if (_selected && should_show_selection) {
- UINT_TO_RGBA(color_map[cSelectedFrameBase], &r, &g, &b, &a);
- gtk_canvas_item_set(frame, "fill_color_rgba", RGBA_TO_UINT(r, g, b, fill_opacity), NULL) ;
+ 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);
- gtk_canvas_item_set(frame, "fill_color_rgba", RGBA_TO_UINT(r, g, b, fill_opacity), NULL) ;
+ 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) {
- gtk_canvas_item_set(frame_handle_start, "fill_color_rgba", color_map[cTrimHandleLockedStart], NULL);
- gtk_canvas_item_set(frame_handle_end, "fill_color_rgba", color_map[cTrimHandleLockedEnd], NULL) ;
+ 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 {
- gtk_canvas_item_set(frame_handle_start, "fill_color_rgba", color_map[cTrimHandleStart], NULL) ;
- gtk_canvas_item_set(frame_handle_end, "fill_color_rgba", color_map[cTrimHandleEnd], NULL) ;
+ 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 (pixel_width < GRAB_HANDLE_LENGTH * 2) {
if (frame_handle_start) {
- gtk_canvas_item_hide (frame_handle_start);
- gtk_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
} if (pixel_width < 2.0) {
if (show_vestigial) {
- gtk_canvas_item_show (vestigial_frame);
+ vestigial_frame->show();
}
if (name_highlight) {
- gtk_canvas_item_hide (name_highlight);
- gtk_canvas_item_hide (name_text);
+ name_highlight->hide();
+ name_pixbuf->hide();
}
if (frame) {
- gtk_canvas_item_hide (frame);
+ frame->hide();
}
if (frame_handle_start) {
- gtk_canvas_item_hide (frame_handle_start);
- gtk_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
-
+
} else {
- gtk_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) {
- gtk_canvas_item_hide (name_highlight);
- gtk_canvas_item_hide (name_text);
+ name_highlight->hide();
+ name_pixbuf->hide();
} else {
- gtk_canvas_item_show (name_highlight);
- gtk_canvas_item_show (name_text);
- reset_name_width (pixel_width);
+ name_highlight->show();
+ if (!get_item_name().empty()) {
+ reset_name_width (pixel_width);
+ }
+ }
+
+ if (visibility & FullWidthNameHighlight) {
+ name_highlight->property_x2() = pixel_width;
+ } else {
+ name_highlight->property_x2() = pixel_width - 1.0;
}
- gtk_canvas_item_set (name_highlight, "x2", pixel_width - 1.0, NULL);
}
if (frame) {
- gtk_canvas_item_show (frame);
- gtk_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)) {
- gtk_canvas_item_hide (frame_handle_start);
- gtk_canvas_item_hide (frame_handle_end);
+ frame_handle_start->hide();
+ frame_handle_end->hide();
}
- gtk_canvas_item_show (frame_handle_start);
- gtk_canvas_item_set(GTK_CANVAS_ITEM(frame_handle_end), "x1", pixel_width - (TimeAxisViewItem::GRAB_HANDLE_LENGTH ), NULL) ;
- gtk_canvas_item_show (frame_handle_end);
- gtk_canvas_item_set(GTK_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)
+TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
{
- gint width;
- gint lbearing;
- gint rbearing;
- gint ascent;
- gint descent;
- Gdk_Font font (NAME_FONT);
+ uint32_t it_width;
+ int pb_width;
+ bool pixbuf_holds_full_name;
- if (name_text == 0) {
+ if (!name_pixbuf) {
return;
}
- int namelen = item_name.length();
- char cstr[namelen+1];
- strcpy (cstr, item_name.c_str());
-
- while (namelen) {
-
- gdk_string_extents (font,
- cstr,
- &lbearing,
- &rbearing,
- &width,
- &ascent,
- &descent);
-
- if (width < (pixel_width - NAME_X_OFFSET)) {
- break;
- }
+ it_width = trackview.editor().frame_to_pixel(item_duration);
+ pb_width = name_pixbuf_width;
- --namelen;
- cstr[namelen] = '\0';
+ 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.
+ */
+ return;
}
-
- if (namelen == 0) {
-
- gtk_canvas_item_hide (name_text);
-
+
+ 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 {
-
- /* don't use name for event handling if it leaves no room
- for trimming to work.
- */
-
- if (pixel_width - width < (NAME_X_OFFSET * 2.0)) {
- if (name_connected) {
- name_connected = false;
- }
- } else {
- if (!name_connected) {
- name_connected = true;
- }
- }
-
- gtk_canvas_item_set (name_text, "text", cstr, NULL);
- gtk_canvas_item_show (name_text);
+ name_pixbuf->show();
}
+
+ name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT);
}
defer to idle loop, otherwise we'll delete this object
while we're still inside this function ...
*/
- Gtk::Main::idle.connect(bind(slot(&TimeAxisViewItem::idle_remove_this_item), this, src));
+ Glib::signal_idle().connect(bind (sigc::ptr_fun (&TimeAxisViewItem::idle_remove_this_item), this, src));
}
/**
* 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;
}
+
+void
+TimeAxisViewItem::set_y (double y)
+{
+ double const old = group->property_y ();
+ if (y != old) {
+ group->move (0, y - old);
+ }
+}
+
+
+
projects / ardour.git / blobdiff