#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/drag_handle.h"
#include "canvas/text.h"
#include "canvas/utils.h"
+#include "ardour/profile.h"
+
#include "ardour_ui.h"
/*
* ardour_ui.h was moved up in the include list
using namespace Glib;
using namespace PBD;
using namespace ARDOUR;
+using namespace ARDOUR_UI_UTILS;
using namespace Gtkmm2ext;
Pango::FontDescription TimeAxisViewItem::NAME_FONT;
void
TimeAxisViewItem::set_constant_heights ()
{
- NAME_FONT = get_font_for_style (X_("TimeAxisViewItemName"));
+ NAME_FONT = Pango::FontDescription (ARDOUR_UI::config()->get_canvasvar_SmallFont());
Gtk::Window win;
Gtk::Label foo;
layout = foo.create_pango_layout (X_("H")); /* just the ascender */
NAME_HEIGHT = height;
- NAME_Y_OFFSET = height + 1;
- NAME_HIGHLIGHT_SIZE = height + 2;
+
+ /* Config->get_show_name_highlight) == true:
+ Y_OFFSET is measured from bottom of the time axis view item.
+ Config->get_show_name_highlight) == false:
+ Y_OFFSET is measured from the top of the time axis view item.
+ */
+
+ if (Config->get_show_name_highlight()) {
+ NAME_Y_OFFSET = height + 1;
+ NAME_HIGHLIGHT_SIZE = height + 2;
+ } else {
+ NAME_Y_OFFSET = 3;
+ NAME_HIGHLIGHT_SIZE = 0;
+ }
NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
}
* @param automation true if this is an automation region view
*/
TimeAxisViewItem::TimeAxisViewItem(
- const string & it_name, ArdourCanvas::Group& parent, TimeAxisView& tv, double spu, Gdk::Color const & 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)
, _dragging (other._dragging)
, _width (0.0)
{
-
- 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 */
- ArdourCanvas::Group* parent = other.group->parent();
+ ArdourCanvas::Item* parent = other.group->parent();
_selected = other._selected;
- init (parent, other.samples_per_pixel, c, other.frame_position,
+ init (parent, other.samples_per_pixel, other.fill_color, other.frame_position,
other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name);
}
void
-TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & 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));
+ fill_color = base_color;
samples_per_pixel = fpp;
frame_position = start;
item_duration = duration;
name_connected = false;
- fill_opacity = 60;
position_locked = false;
max_item_duration = ARDOUR::max_framepos;
min_item_duration = 0;
trackview.current_height() - 1.0));
CANVAS_DEBUG_NAME (frame, string_compose ("frame for %1", get_item_name()));
-
- frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT));
+
+ 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_canvasvar_TimeAxisFrame());
}
- frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::LEFT));
-
} else {
frame = 0;
}
- if (visibility & ShowNameHighlight) {
+ if (Config->get_show_name_highlight() && (visibility & ShowNameHighlight)) {
double width;
double start;
if (visibility & ShowNameText) {
name_text = new ArdourCanvas::Text (group);
CANVAS_DEBUG_NAME (name_text, string_compose ("name text for %1", get_item_name()));
- name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
+ if (Config->get_show_name_highlight()) {
+ name_text->set_position (ArdourCanvas::Duple (NAME_X_OFFSET, trackview.current_height() - NAME_Y_OFFSET));
+ } else {
+ 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;
}
double top = TimeAxisViewItem::GRAB_HANDLE_TOP;
double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
- frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
+ frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
CANVAS_DEBUG_NAME (frame_handle_start, "TAVI frame handle start");
frame_handle_start->set_outline (false);
frame_handle_start->set_fill (false);
frame_handle_start->Event.connect (sigc::bind (sigc::mem_fun (*this, &TimeAxisViewItem::frame_handle_crossing), frame_handle_start));
- frame_handle_end = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
+ frame_handle_end = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
frame_handle_end->set_outline (false);
frame_handle_end->set_fill (false);
if (_selected != yn) {
Selectable::set_selected (yn);
set_frame_color ();
+ set_name_text_color ();
+
+ if (frame) {
+ if (!Config->get_show_name_highlight() && yn) {
+ frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP));
+ frame->set_y1 (_height - 1.0);
+ } else {
+ 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));
+ }
+ frame->set_y1 (_height);
+ }
+ }
}
}
manage_name_highlight ();
if (visibility & ShowNameText) {
- name_text->set_y_position (height - NAME_Y_OFFSET);
+ if (Config->get_show_name_highlight()) {
+ name_text->set_y_position (height - NAME_Y_OFFSET);
+ } else {
+ name_text->set_y_position (NAME_Y_OFFSET);
+ }
}
if (frame) {
- frame->set_y1 (height);
+ if (!Config->get_show_name_highlight() && _selected) {
+ frame->set_outline_what (ArdourCanvas::Rectangle::What (ArdourCanvas::Rectangle::LEFT|ArdourCanvas::Rectangle::RIGHT|ArdourCanvas::Rectangle::BOTTOM|ArdourCanvas::Rectangle::TOP));
+ frame->set_y1 (_height - 1.0);
+ } else {
+ 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));
+ }
+ frame->set_y1 (_height);
+ }
+
if (frame_handle_start) {
frame_handle_start->set_y1 (height);
frame_handle_end->set_y1 (height);
if (name_highlight && wide_enough_for_name && high_enough_for_name) {
name_highlight->show();
-
- name_highlight->set_y0 ((double) _height - NAME_HIGHLIGHT_SIZE);
- name_highlight->set_y1 ((double) _height - 1.0);
-
- if (visibility & FullWidthNameHighlight) {
- /* x0 is always 0.0 */
- name_highlight->set_x1 (_width+RIGHT_EDGE_SHIFT);
- } else {
- /* x0 is always 1.0 */
- name_highlight->set_x1 (_width+RIGHT_EDGE_SHIFT);
- }
+ name_highlight->set (ArdourCanvas::Rect (0.0, (double) _height - NAME_HIGHLIGHT_SIZE, _width+RIGHT_EDGE_SHIFT, (double) _height - 1.0));
} else {
name_highlight->hide();
}
void
-TimeAxisViewItem::set_color (Gdk::Color const & base_color)
+TimeAxisViewItem::set_color (uint32_t base_color)
{
- compute_colors (base_color);
+ fill_color = base_color;
set_colors ();
}
return frame;
}
-ArdourCanvas::Group*
+ArdourCanvas::Item*
TimeAxisViewItem::get_canvas_group()
{
return group;
return name_highlight;
}
-/**
- * Calculate some contrasting color for displaying various parts of this item, based upon the base color.
- *
- * @param color the base color of the item
- */
-void
-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,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.
- */
-
- radius = (unsigned char) rint (floor (sqrt (static_cast<double>(r*r + g*g + b+b))/3.0f));
- minor_shift = 125 - radius;
-
- /* LABEL: rotate around color wheel by 120 degrees anti-clockwise */
-
- r = base_color.get_red()/256;
- g = base_color.get_green()/256;
- b = base_color.get_blue()/256;
-
- if (r > b)
- {
- if (r > g)
- {
- /* red sector => green */
- swap (r,g);
- }
- else
- {
- /* green sector => blue */
- swap (g,b);
- }
- }
- else
- {
- if (b > g)
- {
- /* blue sector => red */
- swap (b,r);
- }
- else
- {
- /* green sector => blue */
- swap (g,b);
- }
- }
-
- 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;
- //lock_handle_color_r = 235;
- //lock_handle_color_g = 16;
- //lock_handle_color_b = 16;
-}
-
/**
* Convenience method to set the various canvas item colors
*/
void
TimeAxisViewItem::set_colors()
{
- set_frame_color();
+ set_frame_color ();
if (name_highlight) {
name_highlight->set_fill_color (fill_color);
}
- if (name_text) {
- double r, g, b, a;
-
- const double black_r = 0.0;
- const double black_g = 0.0;
- const double black_b = 0.0;
-
- const double white_r = 1.0;
- const double white_g = 1.0;
- const double white_b = 1.0;
-
- ArdourCanvas::color_to_rgba (fill_color, r, g, b, a);
-
- /* Use W3C contrast guideline calculation */
-
- double white_contrast = (max (r, white_r) - min (r, white_r)) +
- (max (g, white_g) - min (g, white_g)) +
- (max (b, white_b) - min (b, white_b));
-
- double black_contrast = (max (r, black_r) - min (r, black_r)) +
- (max (g, black_g) - min (g, black_g)) +
- (max (b, black_b) - min (b, black_b));
-
- if (white_contrast > black_contrast) {
- /* use white */
- name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
- } else {
- /* use black */
- name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
- }
-
-#if 0
- double h, s, v;
+ set_name_text_color ();
+ set_trim_handle_colors();
+}
- ArdourCanvas::color_to_hsv (fill_color, h, s, v);
+void
+TimeAxisViewItem::set_name_text_color ()
+{
+ if (!name_text) {
+ return;
+ }
+
- if (v == 0.0) {
- /* fill is black, set text to white */
- name_text->set_color (ArdourCanvas::rgba_to_color (1.0, 1.0, 1.0, 1.0));
- } else if (v == 1.0) {
- /* fill is white, set text to black */
- name_text->set_color (ArdourCanvas::rgba_to_color (0.0, 0.0, 0.0, 1.0));
- } else {
+ uint32_t f;
+
+ if (Config->get_show_name_highlight()) {
+ /* name text will always be on top of name highlight, which
+ will always use our fill color.
+ */
+ f = fill_color;
+ } else {
+ /* name text will be on top of the item, whose color
+ may vary depending on various conditions.
+ */
+ f = get_fill_color ();
+ }
- h = fabs (fmod ((h - 180), 360.0)); /* complementary color */
- s = 1.0; /* fully saturate */
- v = 0.9; /* increase lightness/brightness/value */
+ name_text->set_color (ArdourCanvas::contrasting_text_color (f));
+}
- name_text->set_color (ArdourCanvas::hsv_to_color (h, s, v, 1.0));
- }
-#endif
+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 (_dragging) {
+ return 130;
}
-
- set_trim_handle_colors();
+
+ uint32_t col = ARDOUR_UI::config()->get_canvasvar_FrameBase();
+ return UINT_RGBA_A (col);
}
uint32_t
TimeAxisViewItem::get_fill_color () const
{
- uint32_t f = 0;
+ uint32_t f;
+ uint32_t o;
+
+ o = fill_opacity ();
if (_selected) {
f = ARDOUR_UI::config()->get_canvasvar_SelectedFrameBase();
+ if (o == 0) {
+ /* some condition of this item has set fill opacity to
+ * zero, but it has been selected, so use a mid-way
+ * alpha value to make it reasonably visible.
+ */
+ o = 130;
+ }
+
} else {
if (_recregion) {
f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
} else {
-
- if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
+ 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();
} else {
f = fill_color;
}
}
- return f;
+ return UINT_RGBA_CHANGE_A (f, o);
}
/**
void
TimeAxisViewItem::set_frame_color()
{
- uint32_t f = 0;
-
if (!frame) {
return;
}
- f = get_fill_color ();
-
- if (fill_opacity) {
- f = UINT_RGBA_CHANGE_A (f, fill_opacity);
- }
-
- if (!rect_visible) {
- f = UINT_RGBA_CHANGE_A (f, 0);
- }
-
- frame->set_fill_color (f);
+ frame->set_fill_color (get_fill_color());
set_frame_gradient ();
if (!_recregion) {
+ uint32_t f;
+
if (_selected) {
f = ARDOUR_UI::config()->get_canvasvar_SelectedTimeAxisFrame();
} else {
}
if (!rect_visible) {
+ /* make the frame outline be visible but rather transparent */
f = UINT_RGBA_CHANGE_A (f, 64);
}
void
TimeAxisViewItem::set_trim_handle_colors()
{
+#if 1
+ /* Leave them transparent for now */
+ if (frame_handle_start) {
+ frame_handle_start->set_fill_color (0x00000000);
+ frame_handle_end->set_fill_color (0x00000000);
+ }
+#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_TrimHandle());
}
}
+#endif
}
bool
TimeAxisViewItem::frame_handle_crossing (GdkEvent* ev, ArdourCanvas::Rectangle* item)
{
- if (trackview.editor().effective_mouse_mode() == Editing::MouseObject) {
- switch (ev->type) {
- case GDK_LEAVE_NOTIFY:
- item->set_fill (false);
- break;
- case GDK_ENTER_NOTIFY:
+ switch (ev->type) {
+ case GDK_LEAVE_NOTIFY:
+ /* always hide the handle whenever we leave, no matter what mode */
+ item->set_fill (false);
+ break;
+ case GDK_ENTER_NOTIFY:
+ if (trackview.editor().effective_mouse_mode() == Editing::MouseObject &&
+ !trackview.editor().internal_editing()) {
+ /* never set this to be visible in internal
+ edit mode. Note, however, that we do need to
+ undo visibility (LEAVE_NOTIFY case above) no
+ matter what the mode is.
+ */
item->set_fill (true);
- break;
- default:
- break;
}
+ break;
+ default:
+ break;
}
return false;
}
_width = pixel_width;
manage_name_highlight ();
+ manage_name_text ();
if (pixel_width < 2.0) {
set_frame_gradient ();
}
}
+
+void
+TimeAxisViewItem::drag_start ()
+{
+ _dragging = true;
+ set_frame_color ();
+}
+
+void
+TimeAxisViewItem::drag_end ()
+{
+ _dragging = false;
+ set_frame_color ();
+}
projects / ardour.git / blobdiff