ardour/livetrax
13
0
Fork 0
Code

Selection-after-split behavior (gtk2 part)

Browse Source 
*  When splitting in MouseObject, entered_region should get priority over selected regions.
    This fixes the unexpected case where you try to split an unselected a region, but
       a)  nothing happens  OR
       b)  some other region (maybe off-screen) is split

*  Range mode now has its own option for splits, which can be:
     Clear:  the selection is cleared.
     Preserve:  the selection is left as-is. (default)
     Force:  all the regions that resulted from the split are selected (forcing a tool change).

*  Un-hid the additional config options to select only the regions BEFORE or AFTER a split.

*  Note:  splits made with Cut Tool should be unaffected by these changes.
This commit is contained in:
Ben Loftis 2019-02-12 10:29:03 -06:00
parent 37d28c63db
commit 22deebb42f
2 changed files with 70 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
gtk2_ardour/editor_ops.cc
View File

@ -181,9 +181,6 @@ Editor::split_regions_at (MusicSample where, RegionSelection& regions)
{
bool frozen = false;
RegionSelection pre_selected_regions = selection->regions;
bool working_on_selection = !pre_selected_regions.empty();
list<boost::shared_ptr<Playlist> > used_playlists;
list<RouteTimeAxisView*> used_trackviews;
@ -271,22 +268,23 @@ Editor::split_regions_at (MusicSample where, RegionSelection& regions)
EditorThaw(); /* Emit Signal */
}
if (working_on_selection) {
// IFF we were working on selected regions, try to reinstate the other region selections that existed before the freeze/thaw.
RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split();
/* There are three classes of regions that we might want selected after
splitting selected regions:
- regions selected before the split operation, and unaffected by it
- newly-created regions before the split
- newly-created regions after the split
*/
if (rsas & Existing) {
// region selections that existed before the split.
selection->add (pre_selected_regions);
}
RegionSelectionAfterSplit rsas = Config->get_region_selection_after_split();
//if the user has "Clear Selection" as their post-split behavior, then clear the selection
if (!latest_regionviews.empty() && (rsas == None)) {
selection->clear_objects();
selection->clear_time();
//but leave track selection intact
}
//if the user doesn't want to preserve the "Existing" selection, then clear the selection
if (!(rsas & Existing)) {
selection->clear_objects();
selection->clear_time();
}
//if the user wants newly-created regions to be selected, then select them:
if (mouse_mode == MouseObject) {
for (RegionSelection::iterator ri = latest_regionviews.begin(); ri != latest_regionviews.end(); ri++) {
if ((*ri)->region()->position() < where.sample) {
// new regions created before the split
@ -3210,7 +3208,17 @@ Editor::separate_regions_between (const TimeSelection& ts)
}
if (in_command) {
// selection->set (new_selection);
RangeSelectionAfterSplit rsas = Config->get_range_selection_after_split();
//if our config preference says to clear the selection, clear the Range selection
if (rsas == ClearSel) {
selection->clear_time();
//but leave track selection intact
} else if (rsas == ForceSel) {
//note: forcing the regions to be selected *might* force a tool-change to Object here
selection->set(new_selection);
}
commit_reversible_command ();
}
@ -6416,7 +6424,30 @@ Editor::split_region ()
//if no range was selected, try to find some regions to split
if (current_mouse_mode() == MouseObject || current_mouse_mode() == MouseRange ) { //don't try this for Internal Edit, Stretch, Draw, etc.
RegionSelection rs = get_regions_from_selection_and_edit_point ();
RegionSelection rs;
//new behavior: the Split action will prioritize the entered_regionview rather than selected regions.
//this fixes the unexpected case where you point at a region, but
// * nothing happens OR
// * some other region (maybe off-screen) is split.
if (_edit_point == EditAtMouse && entered_regionview) {
rs.add (entered_regionview);
} else {
rs = selection->regions; //might be empty
}
if (rs.empty()) {
TrackViewList tracks = selection->tracks;
if (!tracks.empty()) {
/* no region selected or entered, but some selected tracks:
* act on all regions on the selected tracks at the edit point
*/
samplepos_t const where = get_preferred_edit_position (Editing::EDIT_IGNORE_NONE, false, false);
get_regions_at(rs, where, tracks);
}
}
const samplepos_t pos = get_preferred_edit_position();
const int32_t division = get_grid_music_divisions (0);
MusicSample where (pos, division);
@ -6426,7 +6457,6 @@ Editor::split_region ()
}
split_regions_at (where, rs);
}
}

25
gtk2_ardour/rc_option_editor.cc
View File

@ -2460,21 +2460,34 @@ RCOptionEditor::RCOptionEditor ()
lm->add (Manual, _("manual layering"));
add_option (_("Editor"), lm);
add_option (_("Editor"), new OptionEditorHeading (_("Split/Separate")));
ComboOption<RangeSelectionAfterSplit> *rras = new ComboOption<RangeSelectionAfterSplit> (
"range-selection-after-separate",
_("After a Separate operation, in Range mode"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_range_selection_after_split),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_range_selection_after_split));
rras->add(ClearSel, _("Clear the Range Selection"));
rras->add(PreserveSel, _("Preserve the Range Selection"));
rras->add(ForceSel, _("Force-Select the regions under the range. (this might cause a tool change)"));
add_option (_("Editor"), rras);
ComboOption<RegionSelectionAfterSplit> *rsas = new ComboOption<RegionSelectionAfterSplit> (
"region-selection-after-split",
_("After splitting selected regions, select"),
_("After a Split operation, in Object mode"),
sigc::mem_fun (*_rc_config, &RCConfiguration::get_region_selection_after_split),
sigc::mem_fun (*_rc_config, &RCConfiguration::set_region_selection_after_split));
// TODO: decide which of these modes are really useful
rsas->add(None, _("no regions"));
// rsas->add(NewlyCreatedLeft, _("newly-created regions before the split"));
// rsas->add(NewlyCreatedRight, _("newly-created regions after the split"));
rsas->add(NewlyCreatedBoth, _("newly-created regions"));
rsas->add(None, _("Clear the Selected Regions"));
rsas->add(NewlyCreatedLeft, _("Select only the newly-created regions BEFORE the split point"));
rsas->add(NewlyCreatedRight, _("Select only the newly-created regions AFTER the split point"));
rsas->add(NewlyCreatedBoth, _("Select the newly-created regions"));
// rsas->add(Existing, _("unmodified regions in the existing selection"));
// rsas->add(ExistingNewlyCreatedLeft, _("existing selection and newly-created regions before the split"));
// rsas->add(ExistingNewlyCreatedRight, _("existing selection and newly-created regions after the split"));
rsas->add(ExistingNewlyCreatedBoth, _("existing selection and newly-created regions"));
rsas->add(ExistingNewlyCreatedBoth, _("Preserve the existing selection, AND select all newly-created regions"));
add_option (_("Editor"), rsas);