#include "gtkmm2ext/keyboard.h"
-#include "ardour_ui.h"
#include "automation_region_view.h"
#include "editing.h"
#include "editor.h"
#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,
set_height (trackview.current_height());
- _fill_color_name = "midi frame base";
+ fill_color_name = "midi frame base";
set_colors ();
_enable_display = true;
_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 ());
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
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;
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
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));
}
}