X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=963fe63c01caf99dee30a4b10cc4066c3f3975b3;hb=167b9dda37135d6172e751ba89302bbd66ea882e;hp=871e83eec83407125f97b0c650b05e21906e0cdb;hpb=a65cd2a1b9d23ab368c310edf1ee75fb8295e718;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index 871e83eec8..963fe63c01 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -36,8 +36,9 @@
 #include "gui_thread.h"
 #include "midi_automation_line.h"
 #include "public_editor.h"
+#include "ui_config.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*                  parent,
                                             AutomationTimeAxisView&                   time_axis,
@@ -57,6 +58,10 @@ AutomationRegionView::AutomationRegionView (ArdourCanvas::Container*
 	}
 
 	group->raise_to_top();
+
+	trackview.editor().MouseModeChanged.connect(_mouse_mode_connection, invalidator (*this),
+	                                            boost::bind (&AutomationRegionView::mouse_mode_changed, this),
+	                                            gui_context ());
 }
 
 AutomationRegionView::~AutomationRegionView ()
@@ -75,6 +80,7 @@ AutomationRegionView::init (bool /*wfd*/)
 
 	set_height (trackview.current_height());
 
+	fill_color_name = "midi frame base";
 	set_colors ();
 
 	_enable_display = true;
@@ -90,12 +96,33 @@ AutomationRegionView::create_line (boost::shared_ptr<ARDOUR::AutomationList> lis
 				_parameter,
 				&_source_relative_time_converter));
 	_line->set_colors();
-	_line->set_height ((uint32_t)rint(trackview.current_height() - NAME_HIGHLIGHT_SIZE));
+	_line->set_height ((uint32_t)rint(trackview.current_height() - 2.5 - NAME_HIGHLIGHT_SIZE));
 	_line->set_visibility (AutomationLine::VisibleAspects (AutomationLine::Line|AutomationLine::ControlPoints));
 	_line->set_maximum_time (_region->length());
 	_line->set_offset (_region->start ());
 }
 
+uint32_t
+AutomationRegionView::get_fill_color() const
+{
+	const std::string mod_name = (_dragging ? "dragging region" :
+	                              trackview.editor().internal_editing() ? "editable region" :
+	                              "midi frame base");
+	if (_selected) {
+		return UIConfiguration::instance().color_mod ("selected region base", mod_name);
+	} else if (high_enough_for_name || !UIConfiguration::instance().get_color_regions_using_track_color()) {
+		return UIConfiguration::instance().color_mod ("midi frame base", mod_name);
+	}
+	return UIConfiguration::instance().color_mod (fill_color, mod_name);
+}
+
+void
+AutomationRegionView::mouse_mode_changed ()
+{
+	// Adjust frame colour (become more transparent for internal tools)
+	set_frame_color();
+}
+
 bool
 AutomationRegionView::canvas_group_event (GdkEvent* ev)
 {
@@ -103,31 +130,12 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev)
 		return false;
 	}
 
-	if (!trackview.editor().internal_editing()) {
-		// not in internal edit mode, so just act like a normal region
-		return RegionView::canvas_group_event (ev);
-	}
-
 	PublicEditor& e = trackview.editor ();
 
-	if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseObject) {
-
-		/* XXX: icky dcast to Editor */
-		e.drags()->set (new EditorRubberbandSelectDrag (dynamic_cast<Editor*> (&e), group), ev);
-		e.drags()->start_grab (ev);
-		return true;
-
-	} else if (ev->type == GDK_MOTION_NOTIFY && e.drags()->active()) {
-		/* we probably shouldn't have to handle this here, but... */
-		e.drags()->motion_handler(ev, false);
-		return true;
-
-	} else if (ev->type == GDK_BUTTON_RELEASE) {
-		if (e.drags()->end_grab (ev)) {
-			return true;
-		} else if (e.current_mouse_mode() != Editing::MouseDraw) {
-			return RegionView::canvas_group_event (ev);
-		}
+	if (trackview.editor().internal_editing() &&
+	    ev->type == GDK_BUTTON_RELEASE &&
+	    e.current_mouse_mode() == Editing::MouseDraw &&
+	    !e.drags()->active()) {
 
 		double x = ev->button.x;
 		double y = ev->button.y;
@@ -179,17 +187,18 @@ AutomationRegionView::add_automation_event (GdkEvent *, framepos_t when, double
 	double when_d = when;
 	_line->view_to_model_coord (when_d, y);
 
-	view->session()->begin_reversible_command (_("add automation event"));
 	XMLNode& before = _line->the_list()->get_state();
 
-	_line->the_list()->add (when_d, y, with_guard_points, false);
+	if (_line->the_list()->editor_add (when_d, y, with_guard_points)) {
+		view->editor().begin_reversible_command (_("add automation event"));
 
-	XMLNode& after = _line->the_list()->get_state();
+		XMLNode& after = _line->the_list()->get_state();
 
-	view->session()->commit_reversible_command (
-		new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
+		view->session()->add_command (new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
+		view->editor().commit_reversible_command ();
 
-	view->session()->set_dirty ();
+		view->session()->set_dirty ();
+	}
 }
 
 bool
@@ -208,9 +217,10 @@ AutomationRegionView::paste (framepos_t                                      pos
 
 	/* add multi-paste offset if applicable */
 	pos += view->editor().get_paste_offset(
-		pos, paste_count, _line->time_converter().to(slist->length()));
+		pos, paste_count, _source_relative_time_converter.to(slist->length()));
 
-	const double model_pos = _line->time_converter().from(pos - _line->time_converter().origin_b());
+	const double model_pos = _source_relative_time_converter.from(
+		pos - _source_relative_time_converter.origin_b());
 
 	XMLNode& before = my_list->get_state();
 	my_list->paste(*slist, model_pos, times);
@@ -226,7 +236,7 @@ AutomationRegionView::set_height (double h)
 	RegionView::set_height(h);
 
 	if (_line) {
-		_line->set_height ((uint32_t)rint(h - NAME_HIGHLIGHT_SIZE));
+		_line->set_height ((uint32_t)rint(h - 2.5 - NAME_HIGHLIGHT_SIZE));
 	}
 }
 
@@ -281,7 +291,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 
 
 void
-AutomationRegionView::entered (bool)
+AutomationRegionView::entered ()
 {
 	if (_line) {
 		_line->track_entered();