if (_internal_editing) {
switch (mouse_mode) {
- case MouseRange:
+ case MouseDraw:
c = _cursors->midi_pencil;
break;
if (_internal_editing) {
switch (mouse_mode) {
- case MouseRange:
+ case MouseDraw:
current_canvas_cursor = _cursors->midi_pencil;
break;
current_canvas_cursor = which_grabber_cursor();
break;
+ case MouseDraw:
+ /* shouldn't be possible, but just cover it anyway ... */
+ current_canvas_cursor = _cursors->midi_pencil;
+ break;
+
case MouseGain:
current_canvas_cursor = _cursors->cross_hair;
break;
}
/* up-down cursor as a cue that automation can be dragged up and down when in join object/range mode */
- if (join_object_range_button.get_active() && last_item_entered) {
- if (last_item_entered->property_parent() && (*last_item_entered->property_parent()).get_data (X_("timeselection"))) {
+ if (join_object_range_button.get_active()) {
+ double x, y;
+ get_pointer_position (x, y);
+ ArdourCanvas::Item* i = track_canvas->get_item_at (x, y);
+ if (i && i->property_parent() && (*i->property_parent()).get_data (X_("timeselection"))) {
pair<TimeAxisView*, int> tvp = trackview_by_y_position (_last_motion_y + vertical_adjustment.get_value() - canvas_timebars_vsize);
if (dynamic_cast<AutomationTimeAxisView*> (tvp.first)) {
current_canvas_cursor = _cursors->up_down;
act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
break;
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
+ break;
+
case MouseGain:
act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain"));
break;
void
Editor::mouse_mode_toggled (MouseMode m)
{
+ Glib::RefPtr<Action> act;
+ Glib::RefPtr<ToggleAction> tact;
+
+ switch (m) {
+ case MouseRange:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-range"));
+ break;
+
+ case MouseObject:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-object"));
+ break;
+
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-draw"));
+ break;
+
+ case MouseGain:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-gain"));
+ break;
+
+ case MouseZoom:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-zoom"));
+ break;
+
+ case MouseTimeFX:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-timefx"));
+ break;
+
+ case MouseAudition:
+ act = ActionManager::get_action (X_("MouseMode"), X_("set-mouse-mode-audition"));
+ break;
+ }
+
+ assert (act);
+
+ tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+ assert (tact);
+
+ if (!tact->get_active()) {
+ /* this was just the notification that the old mode has been
+ * left. we'll get called again with the new mode active in a
+ * jiffy.
+ */
+ return;
+ }
+
+ switch (m) {
+ case MouseDraw:
+ act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit"));
+ tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
+ tact->set_active (true);
+ break;
+ default:
+ break;
+ }
+
mouse_mode = m;
instant_save ();
break;
case MouseRange:
- if (next) set_mouse_mode (MouseZoom);
+ if (next) set_mouse_mode (MouseDraw);
else set_mouse_mode (MouseObject);
break;
+ case MouseDraw:
+ if (next) set_mouse_mode (MouseZoom);
+ else set_mouse_mode (MouseRange);
+ break;
+
case MouseZoom:
if (next) {
if (Profile->get_sae()) {
if (Profile->get_sae()) {
set_mouse_mode (MouseObject);
} else {
- set_mouse_mode (MouseRange);
+ set_mouse_mode (MouseDraw);
}
}
break;
(mouse_mode != MouseAudition || item_type != RegionItem) &&
(mouse_mode != MouseTimeFX || item_type != RegionItem) &&
(mouse_mode != MouseGain) &&
- (mouse_mode != MouseRange)) ||
+ (mouse_mode != MouseRange) &&
+ (mouse_mode != MouseDraw)) ||
((event->type != GDK_BUTTON_PRESS && event->type != GDK_BUTTON_RELEASE) || event->button.button > 3) ||
internal_editing()) {
case RegionItem:
if (mouse_mode != MouseRange || _join_object_range_state == JOIN_OBJECT_RANGE_OBJECT) {
set_selected_regionview_from_click (press, op, true);
- } else if (event->type == GDK_BUTTON_PRESS) {
+ } else if (press) {
selection->clear_tracks ();
set_selected_track_as_side_effect (op, true);
}
if (Keyboard::modifier_state_contains (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier|Keyboard::SecondaryModifier)) &&
event->type == GDK_BUTTON_PRESS) {
- _drags->set (new RubberbandSelectDrag (this, item), event);
+ _drags->set (new EditorRubberbandSelectDrag (this, item), event);
} else if (event->type == GDK_BUTTON_PRESS) {
}
if (internal_editing ()) {
- /* no region drags in internal edit mode */
+ if (event->type == GDK_2BUTTON_PRESS && event->button.button == 1) {
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit"));
+ act->activate ();
+ }
break;
}
add_region_drag (item, event, clicked_regionview);
}
- if (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty()) {
+ if (!internal_editing() && (_join_object_range_state == JOIN_OBJECT_RANGE_OBJECT && !selection->regions.empty())) {
_drags->add (new SelectionDrag (this, clicked_axisview->get_selection_rect (clicked_selection)->rect, SelectionDrag::SelectionMove));
}
}
return true;
} else {
- _drags->set (new RubberbandSelectDrag (this, item), event);
+ _drags->set (new EditorRubberbandSelectDrag (this, item), event);
}
break;
_drags->set (new RegionCreateDrag (this, item, parent), event);
} else {
/* rubberband drag to select automation points */
- _drags->set (new RubberbandSelectDrag (this, item), event);
+ _drags->set (new EditorRubberbandSelectDrag (this, item), event);
}
break;
}
break;
+ case MouseDraw:
+ return false;
+
case MouseRange:
/* relax till release */
return true;
return false;
}
+bool
+Editor::toggle_internal_editing_from_double_click (GdkEvent* event)
+{
+ if (_drags->active()) {
+ _drags->end_grab (event);
+ }
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("MouseMode"), X_("toggle-internal-edit"));
+ act->activate ();
+
+ /* prevent reversion of edit cursor on button release */
+
+ pre_press_cursor = 0;
+
+ return true;
+}
+
bool
Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_type)
{
}
pre_press_cursor = current_canvas_cursor;
-
+
track_canvas->grab_focus();
if (_session && _session->actively_recording()) {
if (Keyboard::is_context_menu_event (&event->button)) {
+ context_click_event = *event;
+
if (!_drags->active ()) {
/* no matter which button pops up the context menu, tell the menu
case AutomationTrackItem:
atv = dynamic_cast<AutomationTimeAxisView*>(clicked_axisview);
if (atv) {
- atv->add_automation_event (item, event, where, event->button.y);
+ atv->add_automation_event (event, where, event->button.y);
}
return true;
break;
case AutomationTrackItem:
dynamic_cast<AutomationTimeAxisView*>(clicked_axisview)->
- add_automation_event (item, event, where, event->button.y);
+ add_automation_event (event, where, event->button.y);
return true;
break;
default:
}
break;
+ case MouseDraw:
+ return true;
+
case MouseRange:
-
// x_style_paste (where, 1.0);
return true;
break;
double fraction;
bool ret = true;
- last_item_entered = item;
-
switch (item_type) {
case ControlPointItem:
if (mouse_mode == MouseGain || mouse_mode == MouseObject) {
Editor::set_internal_edit (bool yn)
{
_internal_editing = yn;
-
+
if (yn) {
- mouse_select_button.set_image (::get_icon("midi_tool_pencil"));
- ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Draw/Edit MIDI Notes"));
- mouse_mode_toggled (mouse_mode);
-
pre_internal_mouse_mode = mouse_mode;
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
}
} else {
-
- mouse_select_button.set_image (::get_icon("tool_range"));
- ARDOUR_UI::instance()->set_tip (mouse_select_button, _("Select/Move Ranges"));
- mouse_mode_toggled (mouse_mode); // sets cursor
-
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
(*i)->leave_internal_edit_mode ();
}
- if (mouse_mode == MouseRange && pre_internal_mouse_mode != MouseRange) {
+ if (mouse_mode == MouseDraw && pre_internal_mouse_mode != MouseDraw) {
/* we were drawing .. flip back to something sensible */
set_mouse_mode (pre_internal_mouse_mode);
}
}
+
+ set_canvas_cursor ();
}
/** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view,
projects / ardour.git / blobdiff