smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-10 08:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Correctly set sidebar tab selection for new users

Browse source
This commit is contained in:
Robin Gareus 2025-01-29 01:45:43 +01:00
parent 41a591ad49
commit 8e444ba45d
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
3 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gtk2_ardour/editor.cc
View file

@ -2254,10 +2254,12 @@ Editor::set_state (const XMLNode& node, int version)
int32_t el_page; int32_t el_page;
if (node.get_property (X_("editor-list-page"), el_page)) { if (node.get_property (X_("editor-list-page"), el_page)) {
_the_notebook.set_current_page (el_page); _the_notebook.set_current_page (el_page);
std::string label (_the_notebook.get_tab_label_text (*_the_notebook.get_nth_page (el_page))); } else {
_notebook_tab1.set_active (label); el_page = _the_notebook.get_current_page ();
_notebook_tab2.set_active (label);
} }
std::string label (_the_notebook.get_tab_label_text (*_the_notebook.get_nth_page (el_page)));
_notebook_tab1.set_active (label);
_notebook_tab2.set_active (label);
yn = false; yn = false;
node.get_property (X_("show-marker-lines"), yn); node.get_property (X_("show-marker-lines"), yn);

8
gtk2_ardour/mixer_ui.cc
View file

@ -2663,10 +2663,12 @@ Mixer_UI::set_state (const XMLNode& node, int version)
int32_t sidebar_page; int32_t sidebar_page;
if (node.get_property (X_("mixer-sidebar-page"), sidebar_page)) { if (node.get_property (X_("mixer-sidebar-page"), sidebar_page)) {
_sidebar_notebook.set_current_page (sidebar_page); _sidebar_notebook.set_current_page (sidebar_page);
std::string label (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (sidebar_page))); } else {
_sidebar_pager1.set_active (label); sidebar_page = _sidebar_notebook.get_current_page ();
_sidebar_pager2.set_active (label);
} }
std::string label (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (sidebar_page)));
_sidebar_pager1.set_active (label);
_sidebar_pager2.set_active (label);
float fract; float fract;
if (!node.get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) { if (!node.get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) {

8
gtk2_ardour/trigger_page.cc
View file

@ -291,10 +291,12 @@ TriggerPage::set_state (const XMLNode& node, int version)
int32_t sidebar_page; int32_t sidebar_page;
if (node.get_property (X_("triggerpage-sidebar-page"), sidebar_page)) { if (node.get_property (X_("triggerpage-sidebar-page"), sidebar_page)) {
_sidebar_notebook.set_current_page (sidebar_page); _sidebar_notebook.set_current_page (sidebar_page);
std::string label (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (sidebar_page))); } else {
_sidebar_pager1.set_active (label); sidebar_page = _sidebar_notebook.get_current_page ();
_sidebar_pager2.set_active (label);
} }
std::string label (_sidebar_notebook.get_tab_label_text (*_sidebar_notebook.get_nth_page (sidebar_page)));
_sidebar_pager1.set_active (label);
_sidebar_pager2.set_active (label);
XMLNode* mn = node.child (_midi_editor->editor_name().c_str()); XMLNode* mn = node.child (_midi_editor->editor_name().c_str());
if (mn) { if (mn) {