#include "gtkmm2ext/utils.h"
#include "gtkmm2ext/gui_thread.h"
-#include "canvas/group.h"
+#include "canvas/container.h"
#include "canvas/rectangle.h"
#include "canvas/debug.h"
#include "canvas/text.h"
-#include "canvas/utils.h"
+#include "canvas/colors.h"
#include "ardour/profile.h"
using namespace Glib;
using namespace PBD;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace Gtkmm2ext;
Pango::FontDescription TimeAxisViewItem::NAME_FONT;
const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
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;
void
TimeAxisViewItem::set_constant_heights ()
{
- NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
+ NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_SmallFont());
Gtk::Window win;
Gtk::Label foo;
* @param automation true if this is an automation region view
*/
TimeAxisViewItem::TimeAxisViewItem(
- const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, uint32_t base_color,
+ const string & it_name, ArdourCanvas::Item& parent, TimeAxisView& tv, double spu, uint32_t base_color,
framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
)
: trackview (tv)
, frame_position (-1)
, item_name (it_name)
+ , selection_frame (0)
, _height (1.0)
, _recregion (recording)
, _automation (automation)
, trackview (other.trackview)
, frame_position (-1)
, item_name (other.item_name)
+ , selection_frame (0)
, _height (1.0)
, _recregion (other._recregion)
, _automation (other._automation)
{
/* share the other's parent, but still create a new group */
- ArdourCanvas::Group* parent = other.group->parent();
+ ArdourCanvas::Item* parent = other.group->parent();
_selected = other._selected;
}
void
-TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, uint32_t base_color,
+TimeAxisViewItem::init (ArdourCanvas::Item* parent, double fpp, uint32_t base_color,
framepos_t start, framepos_t duration, Visibility vis,
bool wide, bool high)
{
- group = new ArdourCanvas::Group (parent);
+ group = new ArdourCanvas::Container (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));
wide_enough_for_name = wide;
high_enough_for_name = high;
rect_visible = true;
+ vestigial_frame = 0;
if (duration == 0) {
warning << "Time Axis Item Duration == 0" << endl;
}
- 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_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,
+ frame = new ArdourCanvas::TimeRectangle (group,
ArdourCanvas::Rect (0.0, 0.0,
- trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT,
- trackview.current_height() - 1.0));
+ trackview.editor().sample_to_pixel(duration),
+ trackview.current_height()));
+
+ frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
-
- if (Config->get_show_name_highlight()) {
- frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
- } else {
- frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM));
- }
if (_recregion) {
- frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
+ frame->set_outline_color (ARDOUR_UI::config()->get_RecordingRect());
} else {
- frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame());
+ frame->set_outline_color (ARDOUR_UI::config()->get_TimeAxisFrame());
}
-
- } else {
-
- frame = 0;
}
if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
double width;
- double start;
+ double start = 1.0;
if (visibility & FullWidthNameHighlight) {
- start = 0.0;
- width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT;
+ width = trackview.editor().sample_to_pixel(item_duration);
} else {
- start = 1.0;
- width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT;
+ width = trackview.editor().sample_to_pixel(item_duration) - 2.0;
}
name_highlight = new ArdourCanvas::Rectangle (group,
ArdourCanvas::Rect (start,
trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE,
- width - 2.0 + RIGHT_EDGE_SHIFT,
+ width - 2.0,
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_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, NAME_Y_OFFSET));
}
name_text->set_font_description (NAME_FONT);
+ name_text->set_ignore_events (true);
} else {
name_text = 0;
}
void
TimeAxisViewItem::set_selected(bool yn)
{
- if (_selected != yn) {
- Selectable::set_selected (yn);
- set_frame_color ();
+ if (_selected == yn) {
+ return;
+ }
+
+ Selectable::set_selected (yn);
+ set_frame_color ();
+ set_name_text_color ();
+
+ if (_selected && frame) {
+ if (!selection_frame) {
+ selection_frame = new ArdourCanvas::TimeRectangle (group);
+ selection_frame->set_fill (false);
+ selection_frame->set_outline_color (ARDOUR_UI::config()->get_SelectedTimeAxisFrame());
+ selection_frame->set_ignore_events (true);
+ }
+ selection_frame->set (frame->get().shrink (1.0));
+ selection_frame->show ();
+ } else {
+ if (selection_frame) {
+ selection_frame->hide ();
+ }
}
}
}
if (frame) {
+
+ frame->set_y0 (1.0);
frame->set_y1 (height);
+
if (frame_handle_start) {
frame_handle_start->set_y1 (height);
frame_handle_end->set_y1 (height);
}
+
+ if (selection_frame) {
+ selection_frame->set (frame->get().shrink (1.0));
+ }
}
- vestigial_frame->set_y1 (height - 1.0);
+ if (vestigial_frame) {
+ vestigial_frame->set_y0 (1.0);
+ vestigial_frame->set_y1 (height);
+ }
set_colors ();
}
if (name_highlight && wide_enough_for_name && high_enough_for_name) {
name_highlight->show();
- name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width+RIGHT_EDGE_SHIFT, (double) _height - 1.0));
+ name_highlight->set (ArdourCanvas::Rect (1.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width, (double) _height - 1.0));
} else {
name_highlight->hide();
return frame;
}
-ArdourCanvas::Group*
+ArdourCanvas::Item*
TimeAxisViewItem::get_canvas_group()
{
return group;
f = get_fill_color ();
}
- name_text->set_color (contrasting_text_color (f));
+ name_text->set_color (ArdourCanvas::contrasting_text_color (f));
}
uint32_t
TimeAxisViewItem::fill_opacity () const
{
if (!rect_visible) {
- /* if the frame/rect is marked as invisible, then the
- * fill should be transparent. simplest: set
-
- * alpha/opacity to zero.
- */
- return 0;
+ /* if the frame/rect is marked as "invisible", then the
+ fill should be translucent.parent.
+ */
+ return 64;
}
if (_dragging) {
return 130;
}
- uint32_t col = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+ uint32_t col = ARDOUR_UI::config()->get_FrameBase();
return UINT_RGBA_A (col);
}
if (_selected) {
- f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+ f = ARDOUR_UI::config()->get_SelectedFrameBase();
if (o == 0) {
/* some condition of this item has set fill opacity to
} else {
if (_recregion) {
- f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
+ f = ARDOUR_UI::config()->get_RecordingRect();
} else {
if ((!Config->get_show_name_highlight() || high_enough_for_name) && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
- f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+ f = ARDOUR_UI::config()->get_FrameBase();
} else {
f = fill_color;
}
return;
}
- frame->set_fill_color (get_fill_color());
+ frame->set_fill_color (get_fill_color());
set_frame_gradient ();
- if (!_recregion) {
- uint32_t f;
+ if (!_recregion) {
+ uint32_t f = ARDOUR_UI::config()->get_TimeAxisFrame();
- if (_selected) {
- f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
- } else {
- f = ARDOUR_UI::config()->get_canvasvar_TimeAxisFrame();
- }
-
- if (!rect_visible) {
+ if (!rect_visible) {
/* make the frame outline be visible but rather transparent */
- f = UINT_RGBA_CHANGE_A (f, 64);
- }
+ f = UINT_RGBA_CHANGE_A (f, 64);
+ }
- frame->set_outline_color (f);
- }
+ frame->set_outline_color (f);
+ }
}
void
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);
+ ArdourCanvas::Color darker = ArdourCanvas::hsva_to_color (h, s, v, a);
stops.push_back (std::make_pair (1.0, darker));
frame->set_gradient (stops, true);
#else
if (frame_handle_start) {
if (position_locked) {
- frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
- frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandleLocked());
+ frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
+ frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandleLocked());
} else {
- frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
- frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_canvasvar_TrimHandle());
+ frame_handle_start->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
+ frame_handle_end->set_fill_color (ARDOUR_UI::config()->get_TrimHandle());
}
}
#endif
if (pixel_width < 2.0) {
if (show_vestigial) {
+
+ if (!vestigial_frame) {
+ vestigial_frame = new ArdourCanvas::TimeRectangle (group, ArdourCanvas::Rect (0.0, 0.0, 2.0, trackview.current_height()));
+ CANVAS_DEBUG_NAME (vestigial_frame, string_compose ("vestigial frame for %1", get_item_name()));
+ vestigial_frame->set_outline_color (ARDOUR_UI::config()->get_VestigialFrame());
+ vestigial_frame->set_fill_color (ARDOUR_UI::config()->get_VestigialFrame());
+ vestigial_frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+ }
+
vestigial_frame->show();
}
}
} else {
- vestigial_frame->hide();
+ if (vestigial_frame) {
+ vestigial_frame->hide();
+ }
if (frame) {
frame->show();
- frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
+ frame->set_x1 (pixel_width);
+
+ if (selection_frame) {
+ selection_frame->set (frame->get().shrink (1.0));
+ }
}
if (frame_handle_start) {
frame_handle_end->hide();
} else {
frame_handle_start->show();
- 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->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
+ frame_handle_end->set_x1 (pixel_width);
frame_handle_end->show();
}
}
projects / ardour.git / blobdiff