ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix tab-button state and cycling through tabs 

The initial calls in `we_have_dependents()` was redundantly setting
all widows to "Hidden", before the actual state was known.

tabbable_state_change() is initially called for all Tabs:
ARDOUR_UI::setup_windows -> add_to_notebook() -> attach(),
or for detached windows Tabbable::set_state() -> hide_tab().

Step_up/down_through_tabs used window visibility to determine
candidates. This incorrectly considered detached visible tabs.
Detached windows cannot be cycled to.

This also addressed an issue where tab-buttons state was
incorrectly unset what unrelated tab state changed.
ImplicitActive of the currently active tab is now retained
when some other window is attached/detached.
This commit is contained in:
Robin Gareus 2021-03-16 00:36:22 +01:00
parent 31d56eb7fc
commit dfa9f92e53
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 23 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/ardour_ui_dependents.cc
View File

@ -112,15 +112,6 @@ ARDOUR_UI::we_have_dependents ()
editor->setup_tooltips ();
editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
/* catch up on tabbable state, in the right order to leave the editor
* selected by default
*/
tabbable_state_change (*rc_option_editor);
tabbable_state_change (*mixer);
tabbable_state_change (*editor);
tabbable_state_change (*recorder);
/* all actions are defined */
ActionManager::load_menus (ARDOUR_COMMAND_LINE::menus_file);

57
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -467,19 +467,19 @@ ARDOUR_UI::step_up_through_tabs ()
/* this list must match the order of visibility buttons */
if (!recorder->window_visible()) {
if (recorder->tabbed()) {
candidates.push_back (recorder);
}
if (!editor->window_visible()) {
if (editor->tabbed()) {
candidates.push_back (editor);
}
if (!mixer->window_visible()) {
if (mixer->tabbed()) {
candidates.push_back (mixer);
}
if (!rc_option_editor->window_visible()) {
if (rc_option_editor->tabbed()) {
candidates.push_back (rc_option_editor);
}
@ -512,19 +512,19 @@ ARDOUR_UI::step_down_through_tabs ()
/* this list must match the order of visibility buttons */
if (!recorder->window_visible()) {
if (recorder->tabbed()) {
candidates.push_back (recorder);
}
if (!editor->window_visible()) {
if (editor->tabbed()) {
candidates.push_back (editor);
}
if (!mixer->window_visible()) {
if (mixer->tabbed()) {
candidates.push_back (mixer);
}
if (!rc_option_editor->window_visible()) {
if (rc_option_editor->tabbed()) {
candidates.push_back (rc_option_editor);
}
@ -823,48 +823,37 @@ ARDOUR_UI::tabbable_state_change (Tabbable& t)
}
ArdourButton* vis_button = 0;
std::vector<ArdourButton*> other_vis_buttons;
if (&t == editor) {
vis_button = &editor_visibility_button;
other_vis_buttons.push_back (&mixer_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
other_vis_buttons.push_back (&recorder_visibility_button);
} else if (&t == mixer) {
vis_button = &mixer_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
other_vis_buttons.push_back (&recorder_visibility_button);
} else if (&t == rc_option_editor) {
vis_button = &prefs_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&mixer_visibility_button);
other_vis_buttons.push_back (&recorder_visibility_button);
} else if (&t == recorder) {
vis_button = &recorder_visibility_button;
other_vis_buttons.push_back (&editor_visibility_button);
other_vis_buttons.push_back (&mixer_visibility_button);
other_vis_buttons.push_back (&prefs_visibility_button);
}
if (!vis_button) {
assert (0);
return;
}
switch (vs) {
case Tabbed:
vis_button->set_active_state (Gtkmm2ext::ImplicitActive);
break;
case Windowed:
vis_button->set_active_state (Gtkmm2ext::ExplicitActive);
break;
case Hidden:
vis_button->set_active_state (Gtkmm2ext::Off);
break;
}
/* First update button states for (other) tabbed windows.
* (Gtkmm2ext::Off or Gtkmm2ext::ImplicitActive)
*/
tabs_switch (NULL, _tabs.get_current_page ());
for (std::vector<ArdourButton*>::iterator b = other_vis_buttons.begin(); b != other_vis_buttons.end(); ++b) {
(*b)->set_active_state (Gtkmm2ext::Off);
switch (vs) {
case Tabbed:
/* nothing to do */
break;
case Windowed:
vis_button->set_active_state (Gtkmm2ext::ExplicitActive);
break;
case Hidden:
vis_button->set_active_state (Gtkmm2ext::Off);
break;
}
}