#include "ardour/types.h"
#include "ardour/ardour.h"
-#include <gtkmm2ext/utils.h>
+#include "gtkmm2ext/utils.h"
+#include "gtkmm2ext/gui_thread.h"
#include "ardour_ui.h"
/*
using namespace Glib;
using namespace PBD;
using namespace ARDOUR;
+using namespace Gtkmm2ext;
Pango::FontDescription* TimeAxisViewItem::NAME_FONT = 0;
const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
*/
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, bool automation, Visibility vis
+ framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
)
: trackview (tv)
, _height (1.0)
void
TimeAxisViewItem::init (
- const string& it_name, double spu, Gdk::Color const & base_color, nframes64_t start, nframes64_t duration, Visibility vis, bool wide, bool high)
+ const string& it_name, double spu, Gdk::Color const & base_color, framepos_t start, framepos_t duration, Visibility vis, bool wide, bool high)
{
item_name = it_name;
samples_per_unit = spu;
- should_show_selection = true;
frame_position = start;
item_duration = duration;
name_connected = false;
fill_opacity = 60;
position_locked = false;
- max_item_duration = ARDOUR::max_frames;
+ max_item_duration = ARDOUR::max_framepos;
min_item_duration = 0;
show_vestigial = true;
visibility = vis;
last_item_width = 0;
wide_enough_for_name = wide;
high_enough_for_name = high;
+ rect_visible = true;
if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl;
if (visibility & ShowNameHighlight) {
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);
+ name_highlight = new ArdourCanvas::SimpleRect (*group, 0.0, trackview.editor().frame_to_pixel(item_duration), trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
} else {
- name_highlight = 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 = new ArdourCanvas::SimpleRect (*group, 1.0, trackview.editor().frame_to_pixel(item_duration) - 1, trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, trackview.current_height());
}
name_highlight->set_data ("timeaxisviewitem", this);
+ name_highlight->property_outline_what() = 0x4;
+ /* we should really use a canvas color property here */
+ name_highlight->property_outline_color_rgba() = RGBA_TO_UINT (0,0,0,255);
} else {
name_highlight = 0;
set_duration (item_duration, this);
set_position (start, this);
+
+ Config->ParameterChanged.connect (*this, invalidator (*this), ui_bind (&TimeAxisViewItem::parameter_changed, this, _1), gui_context ());
}
TimeAxisViewItem::~TimeAxisViewItem()
delete group;
}
+void
+TimeAxisViewItem::hide_rect ()
+{
+ rect_visible = false;
+ set_frame_color ();
+
+ if (name_highlight) {
+ name_highlight->property_outline_what() = 0x0;
+ name_highlight->property_fill_color_rgba() = UINT_RGBA_CHANGE_A(fill_color,64);
+ }
+}
+
+void
+TimeAxisViewItem::show_rect ()
+{
+ rect_visible = true;
+ set_frame_color ();
+
+ if (name_highlight) {
+ name_highlight->property_outline_what() = 0x4;
+ name_highlight->property_fill_color_rgba() = fill_color;
+ }
+}
+
/**
* Set the position of this item on the timeline.
*/
bool
-TimeAxisViewItem::set_position(nframes64_t pos, void* src, double* delta)
+TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
{
if (position_locked) {
return false;
}
/** @return position of this item on the timeline */
-nframes64_t
+framepos_t
TimeAxisViewItem::get_position() const
{
return frame_position;
*/
bool
-TimeAxisViewItem::set_duration (nframes64_t dur, void* src)
+TimeAxisViewItem::set_duration (framepos_t dur, void* src)
{
if ((dur > max_item_duration) || (dur < min_item_duration)) {
warning << string_compose (_("new duration %1 frames is out of bounds for %2"), get_item_name(), dur)
}
/** @return duration of this item */
-nframes64_t
+framepos_t
TimeAxisViewItem::get_duration() const
{
return item_duration;
* @param src the identity of the object that initiated the change
*/
void
-TimeAxisViewItem::set_max_duration(nframes64_t dur, void* src)
+TimeAxisViewItem::set_max_duration(framecnt_t dur, void* src)
{
max_item_duration = dur;
MaxDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
}
/** @return the maximum duration that this item may have */
-nframes64_t
+framecnt_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(nframes64_t dur, void* src)
+TimeAxisViewItem::set_min_duration(framecnt_t dur, void* src)
{
min_item_duration = dur;
MinDurationChanged(max_item_duration, src); /* EMIT_SIGNAL */
}
/** @return the minimum duration that this item mey have */
-nframes64_t
+framecnt_t
TimeAxisViewItem::get_min_duration() const
{
return min_item_duration;
}
}
-/**
- * Set whether an item should show its selection status.
- *
- * @param yn true if this item should show its selected status
- */
-
-void
-TimeAxisViewItem::set_should_show_selection (bool yn)
-{
- if (should_show_selection != yn) {
- should_show_selection = yn;
- set_frame_color ();
- }
-}
-
/** @return the TimeAxisView that this item is on */
TimeAxisView&
-TimeAxisViewItem::get_time_axis_view()
+TimeAxisViewItem::get_time_axis_view () const
{
return trackview;
}
*/
void
-TimeAxisViewItem::set_name_text(const ustring& new_name)
+TimeAxisViewItem::set_name_text(const string& new_name)
{
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"));
+ name_pixbuf->property_pixbuf() = pixbuf_from_string(new_name, NAME_FONT, name_pixbuf_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
if (height > NAME_HIGHLIGHT_SIZE) {
name_highlight->property_y1() = (double) height - 1 - NAME_HIGHLIGHT_SIZE;
- name_highlight->property_y2() = (double) height - 2;
+ name_highlight->property_y2() = (double) height - 1;
}
else {
/* it gets hidden now anyway */
vestigial_frame->property_y2() = height - 1;
update_name_pixbuf_visibility ();
+ set_colors ();
}
void
if (name_highlight) {
name_highlight->property_fill_color_rgba() = fill_color;
- name_highlight->property_outline_color_rgba() = fill_color;
}
set_trim_handle_colors();
}
void
TimeAxisViewItem::set_frame_color()
{
- if (frame) {
- uint32_t r,g,b,a;
+ uint32_t f = 0;
+
+ if (!frame) {
+ return;
+ }
+
+ if (_selected) {
+
+ f = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get();
+
+ if (fill_opacity) {
+ f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+ }
+
+ if (!rect_visible) {
+ f = UINT_RGBA_CHANGE_A (f, 0);
+ }
- if (_selected && should_show_selection) {
- UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
+ } else {
+
+ if (_recregion) {
+ f = ARDOUR_UI::config()->canvasvar_RecordingRect.get();
} else {
- if (_recregion) {
- UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_RecordingRect.get(), &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, a);
+
+ if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
+ f = ARDOUR_UI::config()->canvasvar_FrameBase.get();
} else {
- UINT_TO_RGBA(ARDOUR_UI::config()->canvasvar_FrameBase.get(), &r, &g, &b, &a);
- frame->property_fill_color_rgba() = RGBA_TO_UINT(r, g, b, fill_opacity ? fill_opacity : a);
+ f = fill_color;
}
- }
+
+ if (fill_opacity) {
+ f = UINT_RGBA_CHANGE_A (f, fill_opacity);
+ }
+
+ if (!rect_visible) {
+ f = UINT_RGBA_CHANGE_A (f, 0);
+ }
+ }
}
+
+ frame->property_fill_color_rgba() = f;
+
+ if (!_recregion) {
+ f = ARDOUR_UI::config()->canvasvar_TimeAxisFrame.get();
+
+ if (!rect_visible) {
+ f = UINT_RGBA_CHANGE_A (f, 64);
+ }
+
+ frame->property_outline_color_rgba() = f;
+ }
}
/**
high_enough_for_name = true;
}
- if (visibility & FullWidthNameHighlight) {
- name_highlight->property_x2() = pixel_width;
- } else {
- name_highlight->property_x2() = pixel_width - 1.0;
- }
-
+ name_highlight->property_x2() = pixel_width;
}
if (frame) {
update_name_pixbuf_visibility ();
if (pb_width > 0) {
- name_pixbuf->property_pixbuf() = pixbuf_from_ustring(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
+ name_pixbuf->property_pixbuf() = pixbuf_from_string(item_name, NAME_FONT, pb_width, NAME_HEIGHT, Gdk::Color ("#000000"));
}
}
}
}
+void
+TimeAxisViewItem::parameter_changed (string p)
+{
+ if (p == "color-regions-using-track-color") {
+ set_frame_color ();
+ }
+}
projects / ardour.git / blobdiff