X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.cc;h=e1801f247993e37daad2ec1d7f9cb2f993824c30;hb=983bf548cdc1fb184d122c62190fb76069328a27;hp=d8d3cee8078e387486dd50bdd6ed8836e4317c2e;hpb=3031a99364333b9adcc52c4922687477a1e62337;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc
index d8d3cee807..e1801f2479 100644
--- a/gtk2_ardour/time_axis_view_item.cc
+++ b/gtk2_ardour/time_axis_view_item.cc
@@ -31,6 +31,7 @@
 #include "canvas/group.h"
 #include "canvas/rectangle.h"
 #include "canvas/debug.h"
+#include "canvas/drag_handle.h"
 #include "canvas/text.h"
 #include "canvas/utils.h"
 
@@ -58,8 +59,9 @@ using namespace Gtkmm2ext;
 
 Pango::FontDescription TimeAxisViewItem::NAME_FONT;
 const double TimeAxisViewItem::NAME_X_OFFSET = 15.0;
-const double TimeAxisViewItem::GRAB_HANDLE_TOP = 6;
-const double TimeAxisViewItem::GRAB_HANDLE_WIDTH = 5;
+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;
@@ -80,10 +82,12 @@ TimeAxisViewItem::set_constant_heights ()
         int height = 0;
 
         layout->set_font_description (NAME_FONT);
-        Gtkmm2ext::get_ink_pixel_size (layout, width, height);
+        get_pixel_size (layout, width, height);
+
+        layout = foo.create_pango_layout (X_("H")); /* just the ascender */
 
         NAME_HEIGHT = height;
-        NAME_Y_OFFSET = height + 5; // XXX this offset is magic
+        NAME_Y_OFFSET = height + 1;
         NAME_HIGHLIGHT_SIZE = height + 2;
         NAME_HIGHLIGHT_THRESH = NAME_HIGHLIGHT_SIZE * 3;
 }
@@ -106,12 +110,15 @@ TimeAxisViewItem::TimeAxisViewItem(
 	framepos_t start, framecnt_t duration, bool recording, bool automation, Visibility vis
 	)
 	: trackview (tv)
+	, frame_position (-1)
+	, item_name (it_name)
 	, _height (1.0)
 	, _recregion (recording)
 	, _automation (automation)
 	, _dragging (false)
+	, _width (0.0)
 {
-	init (it_name, &parent, spu, base_color, start, duration, vis, true, true);
+	init (&parent, spu, base_color, start, duration, vis, true, true);
 }
 
 TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
@@ -119,9 +126,13 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	, Selectable (other)
 	, PBD::ScopedConnectionList()
 	, trackview (other.trackview)
+	, frame_position (-1)
+	, item_name (other.item_name)
+	, _height (1.0)
 	, _recregion (other._recregion)
 	, _automation (other._automation)
 	, _dragging (other._dragging)
+	, _width (0.0)
 {
 
 	Gdk::Color c;
@@ -136,12 +147,12 @@ TimeAxisViewItem::TimeAxisViewItem (const TimeAxisViewItem& other)
 	
 	_selected = other._selected;
 	
-	init (other.item_name, parent, other.samples_per_pixel, c, other.frame_position,
+	init (parent, other.samples_per_pixel, c, other.frame_position,
 	      other.item_duration, other.visibility, other.wide_enough_for_name, other.high_enough_for_name);
 }
 
 void
-TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, 
+TimeAxisViewItem::init (ArdourCanvas::Group* parent, double fpp, Gdk::Color const & base_color, 
 			framepos_t start, framepos_t duration, Visibility vis, 
 			bool wide, bool high)
 {
@@ -149,7 +160,6 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 	CANVAS_DEBUG_NAME (group, string_compose ("TAVI group for %1", get_item_name()));
 	group->Event.connect (sigc::mem_fun (*this, &TimeAxisViewItem::canvas_group_event));
 
-	item_name = it_name;
 	samples_per_pixel = fpp;
 	frame_position = start;
 	item_duration = duration;
@@ -179,10 +189,13 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 
 	if (visibility & ShowFrame) {
 		frame = new ArdourCanvas::Rectangle (group, 
-						     ArdourCanvas::Rect (0.0, 1.0, 
-									 trackview.editor().sample_to_pixel(duration), 
-									 trackview.current_height()));
+						     ArdourCanvas::Rect (0.0, 0.0, 
+									 trackview.editor().sample_to_pixel(duration) + RIGHT_EDGE_SHIFT, 
+									 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 (_recregion) {
 			frame->set_outline_color (ARDOUR_UI::config()->get_canvasvar_RecordingRect());
@@ -190,30 +203,34 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 			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) {
 
+		double width;
+		double start;
+
 		if (visibility & FullWidthNameHighlight) {
-			name_highlight = new ArdourCanvas::Rectangle (group, 
-								      ArdourCanvas::Rect (0.0, trackview.editor().sample_to_pixel(item_duration),
-											  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-											  trackview.current_height()));
-			CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+			start = 0.0;
+			width = trackview.editor().sample_to_pixel(item_duration) + RIGHT_EDGE_SHIFT;
 		} else {
-			name_highlight = new ArdourCanvas::Rectangle (group, 
-								      ArdourCanvas::Rect (1.0, trackview.editor().sample_to_pixel(item_duration) - 1, 
-											  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
-											  trackview.current_height()));
-			CANVAS_DEBUG_NAME (name_highlight, string_compose ("name highlight for %1", get_item_name()));
+			start = 1.0;
+			width = trackview.editor().sample_to_pixel(item_duration) - 2.0 + RIGHT_EDGE_SHIFT;
 		}
 
+		name_highlight = new ArdourCanvas::Rectangle (group, 
+							      ArdourCanvas::Rect (start, 
+										  trackview.current_height() - TimeAxisViewItem::NAME_HIGHLIGHT_SIZE, 
+										  width - 2.0 + RIGHT_EDGE_SHIFT,
+										  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_highlight->set_outline_what (ArdourCanvas::Rectangle::TOP);
-                /* we should really use a canvas color property here */
 		name_highlight->set_outline_color (RGBA_TO_UINT (0,0,0,255));
 
 	} else {
@@ -225,7 +242,6 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 		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));
 		name_text->set_font_description (NAME_FONT);
-		
 	} else {
 		name_text = 0;
 	}
@@ -235,13 +251,13 @@ TimeAxisViewItem::init (const string& it_name, ArdourCanvas::Group* parent, doub
 		double top   = TimeAxisViewItem::GRAB_HANDLE_TOP;
 		double width = TimeAxisViewItem::GRAB_HANDLE_WIDTH;
 
-		frame_handle_start = new ArdourCanvas::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+		frame_handle_start = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), true);
 		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::Rectangle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()));
+		frame_handle_end = new ArdourCanvas::DragHandle (group, ArdourCanvas::Rect (0.0, top, width, trackview.current_height()), false);
 		CANVAS_DEBUG_NAME (frame_handle_end, "TAVI frame handle end");
 		frame_handle_end->set_outline (false);
 		frame_handle_end->set_fill (false);
@@ -311,28 +327,21 @@ TimeAxisViewItem::set_position(framepos_t pos, void* src, double* delta)
 
 	frame_position = pos;
 
-	/*  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 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.
-	*/
-
-	double old_unit_pos;
-	double new_unit_pos = pos / samples_per_pixel;
-
-	old_unit_pos = group->position().x;
-
-	if (new_unit_pos != old_unit_pos) {
-		group->set_x_position (new_unit_pos);
-	}
+	double new_unit_pos = trackview.editor().sample_to_pixel (pos);
 
 	if (delta) {
-		(*delta) = new_unit_pos - old_unit_pos;
+		(*delta) = new_unit_pos - group->position().x;
+		if (*delta == 0.0) {
+			return true;
+		}
+	} else {
+		if (new_unit_pos == group->position().x) {
+			return true;
+		}
 	}
 
+	group->set_x_position (new_unit_pos);
+
 	PositionChanged (frame_position, src); /* EMIT_SIGNAL */
 
 	return true;
@@ -543,7 +552,6 @@ TimeAxisViewItem::set_name_text(const string& new_name)
 		return;
 	}
 
-	last_item_width = trackview.editor().sample_to_pixel(item_duration);
 	name_text_width = pixel_width (new_name, NAME_FONT) + 2;
 	name_text->set (new_name);
 
@@ -559,45 +567,66 @@ TimeAxisViewItem::set_height (double height)
 {
         _height = height;
 
-	if (name_highlight) {
-		if (height < NAME_HIGHLIGHT_THRESH) {
-			name_highlight->hide ();
-			high_enough_for_name = false;
-
-		} else {
-			name_highlight->show();
-			high_enough_for_name = true;
-		}
-
-		if (height > NAME_HIGHLIGHT_SIZE) {
-			name_highlight->set_y0 ((double) height - 1 - NAME_HIGHLIGHT_SIZE);
-			name_highlight->set_y1 ((double) height - 1);
-		}
-		else {
-			/* it gets hidden now anyway */
-			name_highlight->set_y0 (1);
-			name_highlight->set_y1 (height);
-		}
-	}
+	manage_name_highlight ();
 
 	if (visibility & ShowNameText) {
-		name_text->set_y_position (height + 1 - NAME_Y_OFFSET);
+		name_text->set_y_position (height - NAME_Y_OFFSET); 
 	}
 
 	if (frame) {
-		frame->set_y1 (height - 1);
+		frame->set_y1 (height);
 		if (frame_handle_start) {
-			frame_handle_start->set_y1 (height - 1);
-			frame_handle_end->set_y1 (height - 1);
+			frame_handle_start->set_y1 (height);
+			frame_handle_end->set_y1 (height);
 		}
 	}
 
-	vestigial_frame->set_y1 (height - 1);
+	vestigial_frame->set_y1 (height - 1.0);
 
-	update_name_text_visibility ();
 	set_colors ();
 }
 
+void
+TimeAxisViewItem::manage_name_highlight ()
+{
+	if (!name_highlight) {
+		return;
+	}
+
+	if (_height < NAME_HIGHLIGHT_THRESH) {
+		high_enough_for_name = false;
+	} else {
+		high_enough_for_name = true;
+	}
+
+	if (_width < 2.0) {
+		wide_enough_for_name = false;
+	} else {
+		wide_enough_for_name = true;
+	}
+
+	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);
+		}
+			
+	} else {
+		name_highlight->hide();
+	}
+
+	manage_name_text ();
+}
+
 void
 TimeAxisViewItem::set_color (Gdk::Color const & base_color)
 {
@@ -726,8 +755,63 @@ TimeAxisViewItem::set_colors()
 	set_frame_color();
 
 	if (name_highlight) {
-		name_highlight->set_fill_color (fill_color);
+                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;
+
+		ArdourCanvas::color_to_hsv (fill_color, h, s, v);
+
+		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 {
+
+			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::hsv_to_color (h, s, v, 1.0));
+		}
+#endif
+
 	}
+	
 	set_trim_handle_colors();
 }
 
@@ -746,7 +830,7 @@ TimeAxisViewItem::get_fill_color () const
 			f = ARDOUR_UI::config()->get_canvasvar_RecordingRect();
 		} else {
 
-			if (high_enough_for_name && !Config->get_color_regions_using_track_color()) {
+			if (high_enough_for_name && !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
 				f = ARDOUR_UI::config()->get_canvasvar_FrameBase();
 			} else {
 				f = fill_color;
@@ -824,7 +908,7 @@ TimeAxisViewItem::set_frame_gradient ()
 	ArdourCanvas::Color darker = ArdourCanvas::hsv_to_color (h, s, v, a);
 	stops.push_back (std::make_pair (1.0, darker));
 	
-	frame->set_gradient (stops, _height);
+	frame->set_gradient (stops, true);
 }
 
 /**
@@ -884,16 +968,16 @@ TimeAxisViewItem::set_samples_per_pixel (double fpp)
 void
 TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 {
+	_width = pixel_width;
+
+	manage_name_highlight ();
+
 	if (pixel_width < 2.0) {
 
 		if (show_vestigial) {
 			vestigial_frame->show();
 		}
 
-		if (name_highlight) {
-			name_highlight->hide();
-		}
-
 		if (frame) {
 			frame->hide();
 		}
@@ -903,30 +987,12 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 			frame_handle_end->hide();
 		}
 
-		wide_enough_for_name = false;
-
 	} else {
 		vestigial_frame->hide();
 
-		if (name_highlight) {
-
-			if (_height < NAME_HIGHLIGHT_THRESH) {
-				name_highlight->hide();
-				high_enough_for_name = false;
-			} else {
-				name_highlight->show();
-				if (!get_item_name().empty()) {
-					reset_name_width (pixel_width);
-				}
-				high_enough_for_name = true;
-			}
-
-			name_highlight->set_x1 (pixel_width);
-		}
-
 		if (frame) {
 			frame->show();
-			frame->set_x1 (pixel_width);
+			frame->set_x1 (pixel_width + RIGHT_EDGE_SHIFT);
 		}
 
 		if (frame_handle_start) {
@@ -941,61 +1007,44 @@ TimeAxisViewItem::reset_width_dependent_items (double pixel_width)
 				frame_handle_end->hide();
 			} else {
 				frame_handle_start->show();
-				frame_handle_end->set_x0 (pixel_width - (TimeAxisViewItem::GRAB_HANDLE_WIDTH));
-				frame_handle_end->set_x1 (pixel_width);
+				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->show();
 			}
 		}
-
-		wide_enough_for_name = true;
 	}
-
-        update_name_text_visibility ();
 }
 
 void
-TimeAxisViewItem::reset_name_width (double /*pixel_width*/)
+TimeAxisViewItem::manage_name_text ()
 {
-	uint32_t it_width;
-	int pb_width;
-	bool showing_full_name;
+	int visible_name_width;
 
 	if (!name_text) {
 		return;
 	}
 
-	it_width = trackview.editor().sample_to_pixel(item_duration);
-	pb_width = name_text_width;
-
-	showing_full_name = last_item_width > pb_width + NAME_X_OFFSET;
-	last_item_width = it_width;
-
-	if (showing_full_name && (it_width >= pb_width + NAME_X_OFFSET)) {
-		/*
-		  we've previously had the full name length showing
-		  and its still showing.
-		*/
+	if (!wide_enough_for_name || !high_enough_for_name) {
+		name_text->hide ();
 		return;
 	}
-
-	if (pb_width > it_width - NAME_X_OFFSET) {
-		pb_width = it_width - NAME_X_OFFSET;
-	}
-
-	if (it_width <= NAME_X_OFFSET) {
-		wide_enough_for_name = false;
-	} else {
-		wide_enough_for_name = true;
+		
+	if (name_text->text().empty()) {
+		name_text->hide ();
 	}
 
-	update_name_text_visibility ();
+	visible_name_width = name_text_width;
 
-	if (pb_width < 1) {
-		pb_width = 1;
+	if (visible_name_width > _width - NAME_X_OFFSET) {
+		visible_name_width = _width - NAME_X_OFFSET;
 	}
 
-	name_text->set (item_name);
-	name_text->clamp_width (pb_width);
+	if (visible_name_width < 1) {
+		name_text->hide ();
+	} else {
+		name_text->clamp_width (visible_name_width);
+		name_text->show ();
+	}
 }
 
 /**
@@ -1021,25 +1070,11 @@ TimeAxisViewItem::set_y (double y)
 	group->set_y_position (y);
 }
 
-void
-TimeAxisViewItem::update_name_text_visibility ()
-{
-	if (!name_text) {
-		return;
-	}
-
-	if (wide_enough_for_name && high_enough_for_name) {
-		name_text->show ();
-	} else {
-		name_text->hide ();
-	}
-}
-
 void
 TimeAxisViewItem::parameter_changed (string p)
 {
 	if (p == "color-regions-using-track-color") {
-		set_frame_color ();
+		set_colors ();
 	} else if (p == "timeline-item-gradient-depth") {
 		set_frame_gradient ();
 	}