ardour/livetrax
13
0
Fork 0
Code

take a rather different approach toggling editor+mixer

Browse Source
This commit is contained in:
Paul Davis 2016-06-07 18:30:04 -04:00
parent 3e089ee678
commit a5ae129a06
1 changed files with 37 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
gtk2_ardour/ardour_ui_dialogs.cc
View File

@ -336,6 +336,7 @@ void
ARDOUR_UI::toggle_editor_and_mixer () ARDOUR_UI::toggle_editor_and_mixer ()
{ {
if (editor->tabbed() && mixer->tabbed()) { if (editor->tabbed() && mixer->tabbed()) {
/* both in the same window */
if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) { if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) {
_tabs.set_current_page (_tabs.page_num (mixer->contents())); _tabs.set_current_page (_tabs.page_num (mixer->contents()));
} else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) { } else if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) {
@ -346,33 +347,54 @@ ARDOUR_UI::toggle_editor_and_mixer ()
return; return;
} }
if (editor->tabbed() && !mixer->tabbed()) { if (editor->tabbed() && !mixer->tabbed()) {
if (main_window_visibility && main_window_visibility->fully_visible()) { /* editor is tabbed, mixer is not */
if (_tabs.get_current_page() == _tabs.page_num (editor->contents())) {
Gtk::Window* mwin = mixer->current_toplevel ();
if (!mwin) {
/* mixer's own window doesn't exist */
mixer->make_visible ();
} else if (!mwin->is_mapped ()) {
/* mixer's own window exists but isn't mapped */
mixer->make_visible ();
} else {
/* mixer window is mapped, editor is visible as tab */
Gtk::Widget* f = mwin->get_focus();
if (f && f->has_focus()) {
/* mixer has focus, switch to editor */
editor->make_visible ();
} else {
mixer->make_visible (); mixer->make_visible ();
} }
} else {
_main_window.present ();
} }
return; return;
} }
if (mixer->tabbed () && !editor->tabbed()) { if (!editor->tabbed() && mixer->tabbed()) {
if (main_window_visibility && main_window_visibility->fully_visible()) { /* mixer is tabbed, editor is not */
if (_tabs.get_current_page() == _tabs.page_num (mixer->contents())) {
Gtk::Window* ewin = editor->current_toplevel ();
if (!ewin) {
/* mixer's own window doesn't exist */
editor->make_visible ();
} else if (!ewin->is_mapped ()) {
/* editor's own window exists but isn't mapped */
editor->make_visible ();
} else {
/* editor window is mapped, mixer is visible as tab */
Gtk::Widget* f = ewin->get_focus();
if (f && f->has_focus()) {
/* editor has focus, switch to mixer */
mixer->make_visible ();
} else {
editor->make_visible (); editor->make_visible ();
} }
} else {
_main_window.present ();
} }
return; return;
} }
if (editor->fully_visible()) {
mixer->make_visible ();
} else {
editor->make_visible ();
}
} }
void void