stop range mode stuff from showing up when in internal edit mode
git-svn-id: svn://localhost/ardour2/branches/3.0@7154 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
7b82cb754e
commit
97721226a4
|
@ -324,30 +324,32 @@ Editor::mouse_mode_toggled (MouseMode m)
|
||||||
mouse_mode = m;
|
mouse_mode = m;
|
||||||
|
|
||||||
instant_save ();
|
instant_save ();
|
||||||
|
|
||||||
if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
|
if (!internal_editing()) {
|
||||||
|
if (mouse_mode != MouseRange && _join_object_range_state == JOIN_OBJECT_RANGE_NONE) {
|
||||||
/* in all modes except range and joined object/range, hide the range selection,
|
|
||||||
show the object (region) selection.
|
/* in all modes except range and joined object/range, hide the range selection,
|
||||||
*/
|
show the object (region) selection.
|
||||||
|
*/
|
||||||
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
|
|
||||||
(*i)->set_should_show_selection (true);
|
for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
|
||||||
}
|
(*i)->set_should_show_selection (true);
|
||||||
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
|
}
|
||||||
(*i)->hide_selection ();
|
for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
|
||||||
}
|
(*i)->hide_selection ();
|
||||||
|
}
|
||||||
} else {
|
|
||||||
|
} else {
|
||||||
/*
|
|
||||||
in range or object/range mode, show the range selection.
|
/*
|
||||||
*/
|
in range or object/range mode, show the range selection.
|
||||||
|
*/
|
||||||
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
|
|
||||||
(*i)->show_selection (selection->time);
|
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
|
||||||
}
|
(*i)->show_selection (selection->time);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
set_canvas_cursor ();
|
set_canvas_cursor ();
|
||||||
}
|
}
|
||||||
|
@ -660,7 +662,9 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
|
if (!internal_editing()) {
|
||||||
|
_drags->set (new SelectionDrag (this, item, SelectionDrag::CreateSelection), event);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
break;
|
break;
|
||||||
|
@ -2573,7 +2577,12 @@ Editor::set_internal_edit (bool yn)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
for (TrackSelection::iterator i = selection->tracks.begin(); i != selection->tracks.end(); ++i) {
|
||||||
|
(*i)->hide_selection ();
|
||||||
|
}
|
||||||
|
|
||||||
start_step_editing ();
|
start_step_editing ();
|
||||||
|
set_canvas_cursor ();
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
|
@ -2588,11 +2597,9 @@ Editor::set_internal_edit (bool yn)
|
||||||
mtv->stop_step_editing ();
|
mtv->stop_step_editing ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mouse_mode_toggled (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,
|
/** Update _join_object_range_state which indicate whether we are over the top or bottom half of a region view,
|
||||||
|
|
|
@ -411,7 +411,7 @@ MidiRegionView::canvas_event(GdkEvent* ev)
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
// Add note drag start
|
// Add note drag start
|
||||||
} else if (editor.current_mouse_mode() == MouseRange) {
|
} else if (editor.internal_editing()) {
|
||||||
group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
|
group->grab(GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
|
||||||
Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
|
Gdk::Cursor(Gdk::FLEUR), ev->motion.time);
|
||||||
last_x = event_x;
|
last_x = event_x;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user