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

Fix Top-level layout (amend 26527ba608)

Browse source
This commit is contained in:
Robin Gareus 2025-01-14 00:22:51 +01:00
parent 2a17746af9
commit 64078909bb
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/widgets/tabbable.cc
View file

@ -125,7 +125,9 @@ Tabbable::default_layout ()
content_left_pane.add (content_att_left); content_left_pane.add (content_att_left);
content_left_pane.add (content_midlevel_vbox); content_left_pane.add (content_midlevel_vbox);
} else { } else {
_content_vbox.pack_start (content_midlevel_vbox, true, true); _content_vbox.pack_start (content_hbox, true, true);
content_hbox.pack_start (content_att_left, false, false);
content_hbox.pack_start (content_midlevel_vbox, true, true);
} }
if (_panelayout & PaneRight) { if (_panelayout & PaneRight) {
@ -137,20 +139,21 @@ Tabbable::default_layout ()
content_midlevel_vbox.pack_start (content_inner_hbox, true, true); content_midlevel_vbox.pack_start (content_inner_hbox, true, true);
} }
content_main_vbox.pack_start (content_main_top, false, false);
content_main_vbox.pack_start (content_main, true, true);
if (_panelayout & PaneBottom) { if (_panelayout & PaneBottom) {
content_inner_hbox.pack_start (content_bottom_pane, true, true); content_inner_hbox.pack_start (content_bottom_pane, true, true);
content_bottom_pane.add (content_main_vbox); content_bottom_pane.add (content_main_vbox);
content_bottom_pane.add (content_att_bottom); content_bottom_pane.add (content_att_bottom);
} else { } else {
content_inner_hbox.pack_start (content_main_vbox, true, true); content_inner_hbox.pack_start (content_main_vbox, true, true);
content_main_vbox.pack_start (content_att_bottom, false, false);
} }
content_inner_hbox.pack_start (content_bus_vbox, false, false); content_inner_hbox.pack_start (content_bus_vbox, false, false);
content_bus_vbox.pack_start (content_bus, true, true); content_bus_vbox.pack_start (content_bus, true, true);
content_main_vbox.pack_start (content_main_top, false, false);
content_main_vbox.pack_start (content_main, true, true);
/* set pane min. sizes */ /* set pane min. sizes */
if (_panelayout & PaneRight) { if (_panelayout & PaneRight) {

3
libs/widgets/widgets/tabbable.h
View file

@ -131,7 +131,7 @@ protected:
* | | +----------------------------------------------------------------------------------------------------------------------+ | | * | | +----------------------------------------------------------------------------------------------------------------------+ | |
* | \--------------------------------------------------------------------------------------------------------------------------/ | * | \--------------------------------------------------------------------------------------------------------------------------/ |
* | | * | |
* | +--content_left_pane-(OPTIONAL)--------------------------------------------------------------------------------------------+ | * | +--content_hbox--OR--content_left_pane--(EXPAND|FILL)----------------------------------------------------------------------+ |
* | | | | * | | | |
* | | +--att_left--+ +--content_midlevel_vbox------------------------------------------------------------------------------+ | | * | | +--att_left--+ +--content_midlevel_vbox------------------------------------------------------------------------------+ | |
* | | $ (EBOX) | | +--content_right_pane--(EXPAND|FILL)--------------------------------------------------------------+ | | | * | | $ (EBOX) | | +--content_right_pane--(EXPAND|FILL)--------------------------------------------------------------+ | | |
@ -177,6 +177,7 @@ protected:
Gtk::HBox content_attachment_hbox; 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; 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 */
Gtk::VBox content_midlevel_vbox; Gtk::VBox content_midlevel_vbox;
HPane content_right_pane; HPane content_right_pane;