allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

fix some issues with the set-mouse-mode-object-range action caused by 22a5113b59

Browse Source
This commit is contained in:
Paul Davis
2025-01-18 08:57:09 -07:00
parent a8f6fcc2df
commit e426804232
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
gtk2_ardour/editor_sections.cc
View File

@@ -273,7 +273,7 @@ EditorSections::selection_changed ()
return;
}
Gtk::TreeModel::Row row = *_model->get_iter (*rows.begin ());
Glib::RefPtr<ToggleAction> tact;
timepos_t start = row[_columns.start];
timepos_t end = row[_columns.end];
@@ -284,14 +284,34 @@ EditorSections::selection_changed ()
/* OK */
break;
case Editing::MouseObject:
if (ActionManager::get_toggle_action (PublicEditor::instance().editor_name().c_str(), "set-mouse-mode-object-range")->get_active ()) {
/* "object-range" mode is not a distinct mouse mode, so
we cannot use get_mouse_mode_action() here
*/
std::cerr << "A\n";
tact = ActionManager::get_toggle_action (X_("Editing"), "set-mouse-mode-object-range");
if (!tact) {
/* missing action */
fatal << X_("programming error: missing mouse-mode-object-range action") << endmsg;
/*NOTREACHED*/
break;
}
if (tact->get_active()) {
/* smart mode; OK */
break;
}
/*fallthrough*/
default:
Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (PublicEditor::instance().editor_name().c_str(), X_("set-mouse-mode-range"));
ract->set_active (true);
std::cerr << "B\n";
Glib::RefPtr<RadioAction> ract = ActionManager::get_radio_action (X_("Editing"), X_("set-mouse-mode-range"));
if (!ract) {
/* missing action */
fatal << X_("programming error: missing mouse-mode-range action") << endmsg;
/*NOTREACHED*/
break;
}
if (ract) {
ract->set_active (true);
}
break;
}

2
gtk2_ardour/time_info_box.cc
View File

@@ -315,7 +315,7 @@ TimeInfoBox::selection_changed ()
case Editing::MouseRange:
if (selection.time.empty()) {
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (PublicEditor::instance().editor_name().c_str(), "set-mouse-mode-object-range");
Glib::RefPtr<ToggleAction> tact = ActionManager::get_toggle_action (X_("Editing"), "set-mouse-mode-object-range");
if (tact->get_active() && !selection.regions.empty()) {
/* show selected regions */