X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_region_view.cc;h=963fe63c01caf99dee30a4b10cc4066c3f3975b3;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=d30cceccb76b0de39b6b3782d68ef46150ee6059;hpb=00887f94dcb800308db5a95aeaa9c9164f45806d;p=ardour.git

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index d30cceccb7..963fe63c01 100644
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -29,7 +29,6 @@
 
 #include "gtkmm2ext/keyboard.h"
 
-#include "ardour_ui.h"
 #include "automation_region_view.h"
 #include "editing.h"
 #include "editor.h"
@@ -37,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,
@@ -96,7 +96,7 @@ 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 ());
@@ -109,11 +109,11 @@ AutomationRegionView::get_fill_color() const
 	                              trackview.editor().internal_editing() ? "editable region" :
 	                              "midi frame base");
 	if (_selected) {
-		return ARDOUR_UI::config()->color_mod ("selected region base", mod_name);
-	} else if (high_enough_for_name || !ARDOUR_UI::config()->get_color_regions_using_track_color()) {
-		return ARDOUR_UI::config()->color_mod ("midi frame base", mod_name);
+		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 ARDOUR_UI::config()->color_mod (fill_color, mod_name);
+	return UIConfiguration::instance().color_mod (fill_color, mod_name);
 }
 
 void
@@ -132,30 +132,10 @@ AutomationRegionView::canvas_group_event (GdkEvent* ev)
 
 	PublicEditor& e = trackview.editor ();
 
-	if (!trackview.editor().internal_editing()) {
-		// not in internal edit mode, so just act like a normal region
-		return RegionView::canvas_group_event (ev);
-	}
-
-	if (ev->type == GDK_BUTTON_PRESS && e.current_mouse_mode() == Editing::MouseContent) {
-
-		/* 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 && e.current_mouse_mode() == Editing::MouseDraw) {
-		if (e.drags()->end_grab (ev)) {
-			return true;
-		} else if (e.current_mouse_mode() != Editing::MouseDraw &&
-		           e.current_mouse_mode() != Editing::MouseContent) {
-			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;
@@ -207,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->editor().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()->add_command (new MementoCommand<ARDOUR::AutomationList> (_line->memento_command_binder(), &before, &after));
-	view->editor().commit_reversible_command ();
+		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
@@ -255,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));
 	}
 }