diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index a27cdfa94a..4c4eea0ea6 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -682,8 +682,8 @@ Editor::Editor () content_app_bar.add (_application_bar); content_att_right.add (_editor_list_vbox); content_att_bottom.add (*_properties_box); - content_toolbar.add (global_vpacker); - content_innermost_hbox.add (editor_summary_pane); + content_main_top.add (global_vpacker); + content_main.add (editor_summary_pane); /* need to show the "contents" widget so that notebook will show if tab is switched to */ diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 41cb6c76b2..25f60aced0 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -385,7 +385,7 @@ Mixer_UI::Mixer_UI () inner_pane.set_drag_cursor (*PublicEditor::instance().cursors()->expand_left_right); content_app_bar.add (_application_bar); - content_innermost_hbox.add (global_hpacker); + content_main.add (global_hpacker); if (!Profile->get_mixbus ()) { content_att_left.add (list_vpacker); diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc index eea71a86e6..dc1bfb8d8f 100644 --- a/gtk2_ardour/recorder_ui.cc +++ b/gtk2_ardour/recorder_ui.cc @@ -195,8 +195,8 @@ RecorderUI::RecorderUI () /* Top-level VBox */ content_app_bar.add (_application_bar); //content_att_right.add (_editor_list_vbox); // TODO - content_toolbar.add(_toolbar); - content_innermost_hbox.add (_pane); + content_main_top.add (_toolbar); + content_main.add (_pane); /* button_table setup is similar to transport_table in ardour_ui */ int vpadding = 1; diff --git a/gtk2_ardour/trigger_page.cc b/gtk2_ardour/trigger_page.cc index 63e3a4ae21..9e04993efb 100644 --- a/gtk2_ardour/trigger_page.cc +++ b/gtk2_ardour/trigger_page.cc @@ -155,7 +155,7 @@ TriggerPage::TriggerPage () /* Top-level Layout */ content_app_bar.add (_application_bar); - content_innermost_hbox.add (_strip_group_box); + content_main.add (_strip_group_box); content_att_bottom.add (_parameter_box); content_att_right.add (_sidebar_notebook); diff --git a/libs/widgets/tabbable.cc b/libs/widgets/tabbable.cc index 0ef03403c9..8cb3c6430b 100644 --- a/libs/widgets/tabbable.cc +++ b/libs/widgets/tabbable.cc @@ -128,8 +128,8 @@ Tabbable::default_layout () content_right_vbox.pack_start (content_att_right, true, true); } - content_inner_vbox.pack_start (content_toolbar, false, false); - content_inner_vbox.pack_start (content_innermost_hbox, true, true); + content_inner_vbox.pack_start (content_main_top, false, false); + content_inner_vbox.pack_start (content_main, true, true); if (_panelayout & PaneRight) { content_right_pane.set_child_minsize (content_att_right, 160); /* rough guess at width of notebook tabs */ diff --git a/libs/widgets/widgets/tabbable.h b/libs/widgets/widgets/tabbable.h index 3699053d83..755e3e1454 100644 --- a/libs/widgets/widgets/tabbable.h +++ b/libs/widgets/widgets/tabbable.h @@ -127,18 +127,18 @@ protected: * | | +-----------------------------------------------------------------------------------------+ | | * | \---------------------------------------------------------------------------------------------/ | * | | - * | +--content_hbox--OR--content_left_pane--------------------------------------------------------+ | + * | +--content_hbox--OR--content_left_pane--(EXPAND|FILL)-----------------------------------------+ | * | | | | - * | | +--att_left--+ +--content_midlevel_vbox--OR-content_midlevel_vpane----------------------+ | | - * | | $ (EBOX) | | +--content_right_pane------------------------------------------------+ | | | + * | | +--att_left--+ +--content_midlevel_vbox--OR-content_midlevel_vpane--(EXPAND|FILL)-------+ | | + * | | $ (EBOX) | | +--content_right_pane--(EXPAND|FILL)---------------------------------+ | | | * | | | | | | +--content_inner_vbox-----------------+ +--content_right_vbox--+ | | | | * | | | O | | | | | | | | | | | - * | | | P S | | | | +--content_toolbar----------------+ | | +--att_right-------+ | | | | | + * | | | P S | | | | +--content_main_top---------------+ | | +--att_right-------+ | | | | | * | | | T I | | | | $ OPTIONAL TOOLBAR (EBOX) | | | $ (EBOX) | | | | | | * | | | I D | | | | +---------------------------------+ |<->| | | | | | | | * | | | O E |<->| | | | P | | OPTIONAL | | | | | | - * | | | N B | O | | | +--content_innermost_hbox---------+ | A | | SIDEBAR | | | | | | - * | | | A A | P | | | $ (HBOX) | | N | | | | | | | | + * | | | N B | O | | | +--content_main--(EXPAND|FILL)----+ | A | | SIDEBAR | | | | | | + * | | | A A | P | | | $ (EBOX) | | N | | | | | | | | * | | | L R | T | | | | | | E | | | | | | | | * | | | | . | | | | !! MAIN PAGE CONTENT !! | |<->| | (LIST) | | | | | | * | | | | P | | | | | | | | | | | | | | @@ -161,25 +161,25 @@ protected: */ /* clang-format off */ - /* _content_vbox * toplevel - * toolbar_frame * the frame is managed in the implementation */ + /* _content_vbox * toplevel + * toolbar_frame * the frame is managed in the implementation */ Gtk::HBox content_header_hbox; - EventBoxExt content_app_bar; /* a placeholder for the transport bar, if you want one */ - Gtk::EventBox content_attachments; /* a placeholder the (strip, list, props) visibility buttons for this tab */ + EventBoxExt content_app_bar; /* a placeholder for the transport bar, if you want one */ + Gtk::EventBox content_attachments; /* a placeholder the (strip, list, props) visibility buttons for this tab */ Gtk::HBox content_attachment_hbox; - EventBoxExt content_tabbables; /* a placeholder for the tabbable switching buttons (used by ArdourUI) */ + EventBoxExt content_tabbables; /* a placeholder for the tabbable switching buttons (used by ArdourUI) */ HPane content_left_pane; Gtk::HBox content_hbox; - EventBoxExt content_att_left; /* a placeholder for the mixer strip, if you want one */ + EventBoxExt content_att_left; /* a placeholder for the mixer strip, if you want one */ VPane content_midlevel_vpane; Gtk::VBox content_midlevel_vbox; HPane content_right_pane; Gtk::VBox content_inner_vbox; - EventBoxExt content_toolbar; /* a placeholder for the content-specific toolbar, if you want one */ - EventBoxExt content_innermost_hbox; /* a placeholder for the innermost content (recorder, cues, editor, mixer) */ + EventBoxExt content_main_top; /* a placeholder for the content-specific toolbar, if you want one */ + EventBoxExt content_main; /* a placeholder for the innermost content (recorder, cues, editor, mixer) */ Gtk::VBox content_right_vbox; - EventBoxExt content_att_right; /* a placeholder for the sidebar list, if you want one */ - EventBoxExt content_att_bottom; /* a placeholder for the property box, if you want one */ + EventBoxExt content_att_right; /* a placeholder for the sidebar list, if you want one */ + EventBoxExt content_att_bottom; /* a placeholder for the property box, if you want one */ /* clang-format on */ /* visibility controls */